fix: 修复每个模块重复导入的问题

Author: tianxiu2b2t

core/dashboard.py

@@ -11,7 +11,10 @@
 from . import utils
 
 from . import scheduler
-from .web import routes as route
+from .web import (
+    routes as route,
+    qps as web_qps
+)
 from aiohttp import web
 
 @dataclass
@@ -39,7 +42,7 @@ class SystemInfo:
     memory_usage: int
     connection: ConnectionStatistics
     clusters: list[ClusterInfo]
-    qps: 'WebValue'
+    qps: int
 
 @dataclass
 class CounterValue:
@@ -69,20 +72,10 @@ def get_json(self):
                      "tcp": item.value.connection.tcp,
                      "udp": item.value.connection.udp,
                  },
-                 "qps": item.value.qps.qps
+                 "qps": item.value.qps
              }} for item in self._data
         ]
 
-@dataclass
-class WebValue:
-    qps: int = 0
-
-    def clone(self):
-        return WebValue(
-            self.qps
-        )
-
-qps = WebValue()
 counter = Counter()
 process = psutil.Process(os.getpid())
 
@@ -116,6 +109,7 @@ async def _(request: web.Request):
 route.static("/assets", "./assets")
 
 def record():
+    global web_qps
     memory            = process.memory_info()
     connection = process.connections()
     stats = SystemInfo(
@@ -126,9 +120,9 @@ def record():
             udp=len([c for c in connection if c.type == socket.SOCK_DGRAM])
         ),
         clusters=[],
-        qps=qps.clone()
+        qps=web_qps
     )
-    qps.qps -= stats.qps.qps
+    web_qps -= stats.qps
     counter.add(stats)
 
 async def init():

core/web.py

@@ -8,12 +8,13 @@
 from aiohttp import web
 from aiohttp.web_urldispatcher import SystemRoute
 
-from . import dashboard
 from . import units
 from . import config
 from .logger import logger
 import ssl
 
+qps: int = 0
+
 class SNIHelper:
     def __init__(self, data: bytes) -> None:
         self.buffer = io.BytesIO(data)
@@ -45,7 +46,8 @@ def get_sni(self):
 
 @web.middleware
 async def middleware(request: web.Request, handler: Any) -> web.Response:
-    dashboard.qps.qps += 1
+    global qps
+    qps += 1
     with request.match_info.set_current_app(app):
         address = request.remote or ""
         try: