From a7663f9267b715c12f080be2e9056ba7eb50e0de Mon Sep 17 00:00:00 2001
From: Conatum <cona@thewisewolf.dev>
Date: Sun, 24 Sep 2023 11:22:17 +0300
Subject: [PATCH] fix(logger): Livelogging ratelimit prevention.

---
 src/meta/logger.py      | 33 ++++++++++++++++++++++-----------
 src/utils/ratelimits.py |  4 ++++
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/meta/logger.py b/src/meta/logger.py
index b2464088..ffa97f7f 100644
--- a/src/meta/logger.py
+++ b/src/meta/logger.py
@@ -10,6 +10,7 @@ from io import StringIO
 from functools import wraps
 from contextvars import ContextVar
 
+import discord
 from discord import Webhook, File
 import aiohttp
 
@@ -304,6 +305,10 @@ class WebHookHandler(logging.StreamHandler):
         self.webhook = Webhook.from_url(self.webhook_url, session=self.session)
 
     async def post(self, record):
+        if record.context == 'Webhook Logger':
+            # Don't livelog livelog errors
+            # Otherwise we recurse and Cloudflare hates us
+            return
         log_context.set("Webhook Logger")
         log_action_stack.set(("Logging",))
         log_app.set(record.app)
@@ -371,7 +376,7 @@ class WebHookHandler(logging.StreamHandler):
         except BucketFull:
             logger.warning(
                 "Can't keep up! "
-                "Ignoring records on live-logger {self.webhook.id}."
+                f"Ignoring records on live-logger {self.webhook.id}."
             )
             self.ignored += 1
             return
@@ -383,16 +388,22 @@ class WebHookHandler(logging.StreamHandler):
                 )
                 self.ignored = 0
 
-        if as_file or len(message) > 1900:
-            with StringIO(message) as fp:
-                fp.seek(0)
-                await self.webhook.send(
-                    f"{self.prefix}\n`{message.splitlines()[0]}`",
-                    file=File(fp, filename="logs.md"),
-                    username=log_app.get()
-                )
-        else:
-            await self.webhook.send(self.prefix + '\n' + message, username=log_app.get())
+        try:
+            if as_file or len(message) > 1900:
+                with StringIO(message) as fp:
+                    fp.seek(0)
+                    await self.webhook.send(
+                        f"{self.prefix}\n`{message.splitlines()[0]}`",
+                        file=File(fp, filename="logs.md"),
+                        username=log_app.get()
+                    )
+            else:
+                await self.webhook.send(self.prefix + '\n' + message, username=log_app.get())
+        except discord.HTTPException:
+            logger.exception(
+                "Live logger errored. Slowing down live logger."
+            )
+            self.bucket.fill()
 
 
 handlers = []
diff --git a/src/utils/ratelimits.py b/src/utils/ratelimits.py
index 56f25728..4c050e94 100644
--- a/src/utils/ratelimits.py
+++ b/src/utils/ratelimits.py
@@ -80,6 +80,10 @@ class Bucket:
             self._last_full = False
             self._level += 1
 
+    def fill(self):
+        self._leak()
+        self._level = max(self._level, self.max_level + 1)
+
     async def wait(self):
         """
         Wait until the bucket has room.