Recover from db error

amadejkastelic · Jul 15, 2024 · f399a28 · f399a28
1 parent 097aac5
commit f399a28
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/bot/common/utils.py b/bot/common/utils.py
@@ -7,7 +7,7 @@
 import typing
 
 import magic
-from django.db import connections
+from django import db as django_db
 
 emoji = ['😼', '😺', '😸', '😹', '😻', '🙀', '😿', '😾', '😩', '🙈', '🙉', '🙊', '😳']
 
@@ -56,7 +56,7 @@ def random_emoji() -> str:
     return random.choice(emoji)
 
 
-def recover_from_db_error():
-    for conn in connections.all():
-        conn.close()
-        conn.connect()
+def recover_from_db_error(exc: Exception):
+    if isinstance(exc, django_db.OperationalError) and exc.args[0] in (2006, 2013):
+        django_db.reset_queries()
+        django_db.close_old_connections()
diff --git a/bot/management/commands/discord_bot.py b/bot/management/commands/discord_bot.py
@@ -20,4 +20,4 @@ def handle(self, *args: typing.Any, **options: typing.Any) -> typing.NoReturn:
                 asyncio.run(bot.DiscordBot().run())
             except db.OperationalError as e:
                 logging.warning(f'DB Connection expired, reconnecting... {str(e)}')
-                utils.recover_from_db_error()
+                utils.recover_from_db_error(e)
diff --git a/bot/management/commands/purge_posts.py b/bot/management/commands/purge_posts.py
@@ -52,7 +52,7 @@ def handle(self, *args: typing.Any, **options: typing.Any) -> typing.NoReturn:
                 ).delete()
             except db.OperationalError as e:
                 logging.warning(f'DB Connection expired, reconnecting... {str(e)}')
-                utils.recover_from_db_error()
+                utils.recover_from_db_error(e)
                 time.sleep(1)
                 continue