Structure changes to match other projects and minor logging improvements

spotproviders/hema.py

@@ -4,7 +4,7 @@ from datetime import datetime
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from data.sig_ref import SIGRef
@@ -68,6 +68,8 @@ class HEMA(HTTPSpotProvider):
                         # Add to our list. Don't worry about de-duping, removing old spots etc. at this point; other
                         # code will do that for us.
                         new_spots.append(spot)
+            except ReadTimeout:
+                logging.warning(f"Read timeout when accessing HEMA spots API.")
             except ConnectionError:
                 logging.warning("Connection error when accessing HEMA spots API.")
         return new_spots

spotproviders/http_spot_provider.py

@@ -4,6 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
+from requests import ReadTimeout
 from requests.exceptions import ConnectionError
 
 from core.constants import HTTP_HEADERS
@@ -59,6 +60,8 @@ class HTTPSpotProvider(SpotProvider):
 
         except ConnectionError:
             logging.warning(f"Connection error when accessing {self.name} spots API.")
+        except ReadTimeout:
+            logging.warning(f"Read timeout when accessing {self.name} spots API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in HTTP JSON Spot Provider (" + self.name + ")")

spotproviders/sota.py

@@ -2,7 +2,7 @@ import logging
 from datetime import datetime
 
 import requests
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from data.sig_ref import SIGRef
@@ -60,4 +60,6 @@ class SOTA(HTTPSpotProvider):
                     new_spots.append(spot)
             except ConnectionError:
                 logging.warning("Connection error when accessing SOTA spots API")
+            except ReadTimeout:
+                logging.warning(f"Read timeout when accessing SOTA spots API.")
         return new_spots