Error handling improvements

providers/callsigndata/file_download_callsign_data_provider.py

@@ -3,8 +3,7 @@ from datetime import datetime
 from threading import Event, Thread
 
 import pytz
-from requests import ReadTimeout
-from requests.exceptions import ConnectionError, ConnectTimeout
+from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from core.url_data_cache import URLDataCache

providers/callsigndata/hamqth.py

@@ -5,7 +5,7 @@ from datetime import datetime, timedelta
 import pytz
 import xmltodict
 from pyhamtools import callinfo
-from requests import ConnectTimeout, ReadTimeout
+from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
 from requests_cache import CachedSession
 
 from core.config import SERVER_OWNER_CALLSIGN

providers/callsigndata/qrz.py

@@ -5,7 +5,7 @@ from datetime import datetime, timedelta
 import pytz
 import xmltodict
 from pyhamtools import callinfo
-from requests import ConnectTimeout, ReadTimeout
+from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
 from requests_cache import CachedSession
 
 from core.constants import HTTP_HEADERS

providers/sigrefdata/file_download_sig_ref_data_provider.py

@@ -3,8 +3,7 @@ from datetime import datetime
 from threading import Event, Thread
 
 import pytz
-from requests import ReadTimeout
-from requests.exceptions import ConnectionError, ConnectTimeout
+from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from core.url_data_cache import URLDataCache

providers/spot/http_spot_provider.py

@@ -4,8 +4,7 @@ from threading import Event, Thread
 
 import pytz
 import requests
-from requests import ReadTimeout
-from requests.exceptions import ConnectionError, ConnectTimeout
+from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from providers.spot.spot_provider import SpotProvider

providers/spot/sse_spot_provider.py

@@ -3,7 +3,7 @@ from datetime import datetime
 from threading import Event, Lock, Thread
 
 import pytz
-from requests_sse import EventSource
+from requests_sse import EventSource, InvalidStatusCodeError
 
 from core.constants import HTTP_HEADERS
 from providers.spot.spot_provider import SpotProvider
@@ -89,6 +89,9 @@ class SSESpotProvider(SpotProvider):
                                     logger.exception(
                                         f"Exception processing message from SSE Spot Provider ({self.name})"
                                     )
+                    except InvalidStatusCodeError as e:
+                        self.status = "Error"
+                        logger.exception(f"HTTP {e.status_code} returned from SSE Spot Provider ({self.name}).")
                     finally:
                         self._set_event_source(None)
 

providers/staticdata/file_download_static_data_provider.py

@@ -3,8 +3,7 @@ from datetime import datetime
 from threading import Event, Thread
 
 import pytz
-from requests import ReadTimeout
-from requests.exceptions import ConnectionError, ConnectTimeout
+from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from core.url_data_cache import URLDataCache