fix: 修复统计和代理 web 时候等待代理服务关闭时间过长

Author: tianxiu2b2t

VERSION

@@ -1 +1 @@
-3.0.2
+3.0.3

core/cluster.py

@@ -1127,6 +1127,8 @@ async def _(request: aweb.Request):
             type = db.StatusType.NOT_FOUND
         elif resp.status == 302:
             type = db.StatusType.REDIRECT
+        storage_name = file.storage.unique_id if file.storage is not None else None
+        db.add_file(cluster.id, storage_name, size)
         db.add_response(
             address,
             type

core/dashboard.py

@@ -137,7 +137,6 @@ async def _(request: web.Request):
         db.ClusterStatisticsTable.hour >= hour_of_day,
         db.ClusterStatisticsTable.hour < next_hour
     ).all()
-    print(hour_of_day, next_hour)
     return web.json_response({
         "hits": sum([int(item.hits) for item in q]),
         "bytes": sum([int(item.bytes) for item in q])

core/web.py

@@ -234,7 +234,7 @@ async def _check_server(ip: str, port: int):
     try:
         r, w = await asyncio.wait_for(asyncio.open_connection(ip, port), 5)
         w.close()
-        await w.wait_closed()
+        await asyncio.wait_for(w.wait_closed(), 10)
         return True
     except:
         logger.ttraceback("web.traceback.check_server", port=port)