From 0a6c850f4de959f80c6d9b7a0eef42b996ebeecb Mon Sep 17 00:00:00 2001
From: morpheus65535 <louis_vezina@hotmail.com>
Date: Mon, 17 May 2021 19:39:09 -0400
Subject: [PATCH] Added better exception handling for Radarr SignalR feed.

---
 bazarr/signalr_client.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bazarr/signalr_client.py b/bazarr/signalr_client.py
index 671a86f7b..c9e65980a 100644
--- a/bazarr/signalr_client.py
+++ b/bazarr/signalr_client.py
@@ -3,7 +3,6 @@
 import logging
 
 import gevent
-import threading
 from requests import Session
 from signalr import Connection
 from requests.exceptions import ConnectionError
@@ -18,7 +17,7 @@ from utils import get_sonarr_version
 from get_args import args
 
 
-class SonarrSignalrClient(threading.Thread):
+class SonarrSignalrClient:
     def __init__(self):
         super(SonarrSignalrClient, self).__init__()
         self.apikey_sonarr = None
@@ -74,7 +73,7 @@ class SonarrSignalrClient(threading.Thread):
         self.connection.exception += self.exception_handler
 
 
-class RadarrSignalrClient(threading.Thread):
+class RadarrSignalrClient:
     def __init__(self):
         super(RadarrSignalrClient, self).__init__()
         self.apikey_radarr = None
@@ -97,6 +96,10 @@ class RadarrSignalrClient(threading.Thread):
         if settings.general.getboolean('use_radarr'):
             self.start()
 
+    def exception_handler(self):
+        logging.error("BAZARR connection to Radarr SignalR feed has failed. We'll try to reconnect.")
+        self.restart()
+
     def configure(self):
         self.apikey_radarr = settings.radarr.apikey
         self.connection = HubConnectionBuilder() \
@@ -115,8 +118,7 @@ class RadarrSignalrClient(threading.Thread):
         self.connection.on_reconnect(lambda: logging.info('BAZARR SignalR client for Radarr connection as been lost. '
                                                           'Trying to reconnect...'))
         self.connection.on_close(lambda: logging.debug('BAZARR SignalR client for Radarr is disconnected.'))
-        self.connection.on_error(lambda data: logging.debug(f"BAZARR SignalR client for Radarr: An exception was thrown"
-                                                            f" closed{data.error}"))
+        self.connection.on_error(self.exception_handler)
         self.connection.on("receiveMessage", dispatcher)