fix: some garven errors

suggestionsbot · Mar 13, 2024 · 8dc159e · 8dc159e
1 parent fbb70b9
commit 8dc159e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/garven/routers/aggregate.py b/garven/routers/aggregate.py
@@ -54,6 +54,13 @@ async def guild_count(request: Request):
             log.error("/guilds/count WS threw '%s'", item.response_data)
             continue
 
+        if item is None:
+            statistic.partial_response = True
+            log.error(
+                "/guilds/count gave a null item",
+            )
+            continue
+
         statistic.statistic += item
 
     cluster_count = int(os.environ.get("CLUSTER_COUNT", 11))

diff --git a/garven/routers/cluster.py b/garven/routers/cluster.py
@@ -52,10 +52,15 @@ async def cluster_status(request: Request):
     z: Server = request.app.zonis
     d: dict[str, dict[str, str]] = await z.request_all("cluster_ws_status")
     shard_data = {}
-    for _, item in deepcopy(d).items():
+    for c, item in deepcopy(d).items():
         if isinstance(item, RequestFailed):
             partial_response = True
-            log.error("/cluster/status/ws WS threw '%s'", item.response_data)
+            log.error("/cluster/latency/ws WS threw '%s'", item.response_data)
+            continue
+
+        if item is None:
+            partial_response = True
+            log.error("/cluster/latency/ws had a null value from %s", c)
             continue
 
         for shard_id, value in item.items():