fix: 修复统计出现错误的情况

Author: tianxiu2b2t

core/dashboard.py

@@ -3,16 +3,15 @@
 from collections import deque
 from dataclasses import dataclass
 import io
-import json
 import os
 from pathlib import Path
 import socket
-from typing import Any, Optional
+from typing import Optional
 
 import aiohttp
 import psutil
 
-from core import cache, cluster, config, logger
+from core import cluster, config, logger
 
 from . import utils
 
@@ -23,6 +22,8 @@
 )
 from aiohttp import web
 
+from . import database as db
+
 @dataclass
 class CollectionUsage:
     total: int
@@ -125,6 +126,24 @@ async def _(request: web.Request):
 async def _(request: web.Request):
     return web.json_response(counter.get_json())
 
+@route.get("/api/count")
+async def _(request: web.Request):
+    # statistics of the cluster hits and bytes
+    session = db.SESSION.get_session()
+    current_hour = db.get_hour()
+    hour_of_day = (current_hour // 24) * 24
+    next_hour = hour_of_day + 24
+    q = session.query(db.ClusterStatisticsTable).filter(
+        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])
+    })
+    
+
 @route.get("/api/openbmclapi/rank")
 async def _(request: web.Request):
     async with aiohttp.ClientSession(

core/database.py

@@ -223,9 +223,10 @@ def commit():
     total_bytes = 0
     total_storages = 0
     cache = FILE_CACHE.copy()
+    response_cache = RESPONSE_CACHE.copy()
     session = SESSION.get_session()
     clusters: defaultdict[tuple[int, str], FileStatistics] = defaultdict(lambda: FileStatistics(0, 0))
-    for key, value in FILE_CACHE.items():
+    for key, value in cache.items():
         hour = key.hour
         cluster = key.cluster_id
         storage = key.storage_id
@@ -240,7 +241,7 @@ def commit():
     for cluster, value in clusters.items():
         _commit_cluster(cluster[0], cluster[1], value.hits, value.bytes)
 
-    for hour, value in RESPONSE_CACHE.items():
+    for hour, value in response_cache.items():
         _commit_response(hour, value.ip_tables, value.success, value.forbidden, value.redirect, value.not_found, value.error)
 
     session.commit()
@@ -255,7 +256,7 @@ def commit():
 
     old_keys.clear()
 
-    for hour, value in RESPONSE_CACHE.items():
+    for hour, value in response_cache.items():
         RESPONSE_CACHE[hour].success -= value.success
         RESPONSE_CACHE[hour].forbidden -= value.forbidden
         RESPONSE_CACHE[hour].redirect -= value.redirect