Structure changes to match other projects and minor logging improvements

solarconditionsproviders/giroionosonde.py

@@ -5,7 +5,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from solarconditionsproviders.ionosonde_utils import compute_band_states
@@ -134,6 +134,9 @@ class GIROIonosonde(SolarConditionsProvider):
                 logging.warning(f"HTTP {http_response.status_code} when calling Giro ionosonde API.")
                 return None, None, None
             return self._parse_all(http_response.text)
+        except ReadTimeout:
+            logging.warning(f"Read timeout when accessing Giro ionosonde API.")
+            return None, None, None
         except ConnectionError:
             logging.warning("Connection error when accessing Giro ionosonde API.")
             return None, None, None

solarconditionsproviders/http_solar_conditions_provider.py

@@ -4,7 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from solarconditionsproviders.solar_conditions_provider import SolarConditionsProvider
@@ -54,6 +54,8 @@ class HTTPSolarConditionsProvider(SolarConditionsProvider):
 
         except ConnectionError:
             logging.warning(f"Connection error when accessing {self.name} solar conditions API.")
+        except ReadTimeout:
+            logging.warning(f"Read timeout when accessing {self.name} solar conditions API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in HTTP Solar Conditions Provider (" + self.name + ")")

solarconditionsproviders/kc2gprop.py

@@ -4,7 +4,7 @@ from threading import Thread, Event
 
 import pytz
 import requests
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError, ReadTimeout
 
 from core.constants import HTTP_HEADERS
 from solarconditionsproviders.ionosonde_utils import compute_band_states
@@ -118,6 +118,8 @@ class KC2GProp(SolarConditionsProvider):
 
         except ConnectionError:
             logging.warning("Connection error when accessing KC2G ionosonde API.")
+        except ReadTimeout:
+            logging.warning(f"Read timeout when accessing KC2G ionosonde API.")
         except Exception:
             self.status = "Error"
             logging.exception("Exception in KC2G ionosonde data provider")