Packet filtered counter fixed

2022-06-30 00:02:01 +02:00
parent a064652fcf
commit 4174654c3c
7 changed files with 11 additions and 10 deletions
--- a/backend/proxy/init.py
+++ b/backend/proxy/init.py
@@ -58,7 +58,7 @@ class Proxy:
                        regex_id = stdout_line.split()[1]
                        async with self.filter_map_lock:
                            self.filter_map[regex_id].blocked+=1
-                            if self.callback_blocked_update: await self.callback_blocked_update(self.filter_map[regex_id])
+                            if self.callback_blocked_update: self.callback_blocked_update(self.filter_map[regex_id])
            except Exception:
                return await self.process.wait()
        else:
--- a/backend/utils.py
+++ b/backend/utils.py
@@ -215,7 +215,8 @@ class ServiceManager:
                        return
                    else:
                        await asyncio.sleep(.5)
-            except Exception: 
+            except asyncio.CancelledError:
+                self._set_status(STATUS.STOP)
                await self.proxy.stop()
        self.starter = asyncio.create_task(func())

--- a/frontend/build/asset-manifest.json
+++ b/frontend/build/asset-manifest.json
@@ -1,13 +1,13 @@
 {
  "files": {
    "main.css": "/static/css/main.c375ae17.css",
-    "main.js": "/static/js/main.e6c85636.js",
+    "main.js": "/static/js/main.cd9ce6a2.js",
    "index.html": "/index.html",
    "main.c375ae17.css.map": "/static/css/main.c375ae17.css.map",
-    "main.e6c85636.js.map": "/static/js/main.e6c85636.js.map"
+    "main.cd9ce6a2.js.map": "/static/js/main.cd9ce6a2.js.map"
  },
  "entrypoints": [
    "static/css/main.c375ae17.css",
-    "static/js/main.e6c85636.js"
+    "static/js/main.cd9ce6a2.js"
  ]
 }
--- a/frontend/build/index.html
+++ b/frontend/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"><link rel="manifest" href="/site.webmanifest"><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#FFFFFFFF"/><meta name="description" content="Firegex by Pwnzer0tt1"/><title>Firegex</title><script defer="defer" src="/static/js/main.e6c85636.js"></script><link href="/static/css/main.c375ae17.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"><link rel="manifest" href="/site.webmanifest"><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#FFFFFFFF"/><meta name="description" content="Firegex by Pwnzer0tt1"/><title>Firegex</title><script defer="defer" src="/static/js/main.cd9ce6a2.js"></script><link href="/static/css/main.c375ae17.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
--- a/frontend/build/static/js/main.cd9ce6a2.js
+++ b/frontend/build/static/js/main.cd9ce6a2.js
--- a/frontend/build/static/js/main.cd9ce6a2.js.LICENSE.txt
+++ b/frontend/build/static/js/main.cd9ce6a2.js.LICENSE.txt
--- a/frontend/build/static/js/main.cd9ce6a2.js.map
+++ b/frontend/build/static/js/main.cd9ce6a2.js.map