Retry on ConnectionError (#740)

Add Retries for connection to qbit
StuffAnThings · Feb 2, 2025 · a2add1d · a2add1d
1 parent cae7461
commit a2add1d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/modules/config.py b/modules/config.py
@@ -754,20 +754,32 @@ def _sort_share_limits(share_limits):
         # Connect to Qbittorrent
         self.qbt = None
         if "qbt" in self.data:
-            logger.info("Connecting to Qbittorrent...")
-            self.qbt = Qbt(
-                self,
-                {
-                    "host": self.util.check_for_attribute(self.data, "host", parent="qbt", throw=True),
-                    "username": self.util.check_for_attribute(self.data, "user", parent="qbt", default_is_none=True),
-                    "password": self.util.check_for_attribute(self.data, "pass", parent="qbt", default_is_none=True),
-                },
-            )
+            self.qbt = self.__connect()
         else:
             e = "Config Error: qbt attribute not found"
             self.notify(e, "Config")
             raise Failed(e)
 
+    def __retry_on_connect(exception):
+        return isinstance(exception.__cause__, ConnectionError)
+
+    @retry(
+        retry_on_exception=__retry_on_connect,
+        stop_max_attempt_number=5,
+        wait_exponential_multiplier=30000,
+        wait_exponential_max=120000,
+    )
+    def __connect(self):
+        logger.info("Connecting to Qbittorrent...")
+        return Qbt(
+            self,
+            {
+                "host": self.util.check_for_attribute(self.data, "host", parent="qbt", throw=True),
+                "username": self.util.check_for_attribute(self.data, "user", parent="qbt", default_is_none=True),
+                "password": self.util.check_for_attribute(self.data, "pass", parent="qbt", default_is_none=True),
+            },
+        )
+
     # Empty old files from recycle bin or orphaned
     def cleanup_dirs(self, location):
         num_del = 0

diff --git a/modules/qbittorrent.py b/modules/qbittorrent.py
@@ -5,6 +5,7 @@
 from fnmatch import fnmatch
 from functools import cache
 
+from qbittorrentapi import APIConnectionError
 from qbittorrentapi import Client
 from qbittorrentapi import LoginFailed
 from qbittorrentapi import NotFound404Error
@@ -77,6 +78,9 @@ def __init__(self, config, params):
             ex = "Qbittorrent Error: Failed to login. Invalid username/password."
             self.config.notify(ex, "Qbittorrent")
             raise Failed(ex)
+        except APIConnectionError as exc:
+            self.config.notify(exc, "Qbittorrent")
+            raise Failed(exc) from ConnectionError(exc)
         except Exception as exc:
             self.config.notify(exc, "Qbittorrent")
             raise Failed(exc)