Refactor of caching & data storage part 6 #118

sigrefdataproviders/file_download_sig_ref_data_provider.py

@@ -21,7 +21,7 @@ class FileDownloadSIGRefDataProvider(SIGRefDataProvider):
         self._poll_interval = poll_interval
         self._thread = None
         self._stop_event = Event()
-        self._url_data_cache = URLDataCache("sigrefdata-" + sig_name)
+        self._url_data_cache = URLDataCache("sigrefdata_" + sig_name)
 
     def start(self):
         # Fire off the polling thread. It will poll immediately on startup, then sleep for poll_interval between
@@ -50,7 +50,7 @@ class FileDownloadSIGRefDataProvider(SIGRefDataProvider):
             if http_response.ok:
                 # Pass off to the subclass for processing
                 new_data = self._http_response_to_data(http_response)
-                # Submit the new spots for processing. There might not be any spots for the less popular programs.
+                # Add the new data to the SIG Ref data store
                 if new_data:
                     self._add_data(new_data)
 
@@ -62,8 +62,10 @@ class FileDownloadSIGRefDataProvider(SIGRefDataProvider):
                 logging.warning(f"HTTP {http_response.status_code} when downloading SIG ref data for {self.sig_name}.")
 
         except ConnectionError:
+            self.status = "Error"
             logging.warning(f"Connection error when downloading SIG ref data for {self.sig_name}.")
         except (ConnectTimeout, ReadTimeout):
+            self.status = "Error"
             logging.warning(f"Timeout when downloading SIG ref data for {self.sig_name}.")
         except Exception:
             self.status = "Error"

sigrefdataproviders/local_file_sig_ref_data_provider.py

@@ -22,10 +22,11 @@ class LocalFileSIGRefDataProvider(SIGRefDataProvider):
                 self.status = "OK"
                 self.last_update_time = datetime.now(pytz.UTC)
             else:
-                logging.info("No new SIG ref data found for " + self.sig_name)
+                self.status = "Error"
+                logging.info("Failed to load SIG ref data for " + self.sig_name)
         except Exception as e:
             self.status = "Error"
-            logging.exception("Exception in local file SIG Ref Data Provider (" + self.sig_name + ")")
+            logging.error("Exception in local file SIG Ref Data Provider (" + self.sig_name + ")", e, exc_info=True)
 
     def stop(self):
         pass

sigrefdataproviders/sig_ref_data_provider.py

@@ -15,7 +15,6 @@ class SIGRefDataProvider:
         self.sig_name = sig_name
         self.enabled = provider_config["enabled"]
         self.last_update_time = datetime.min.replace(tzinfo=pytz.UTC)
-        self.last_spot_time = datetime.min.replace(tzinfo=pytz.UTC)
         self.status = "Not Started" if self.enabled else "Disabled"
         self.reference_count = 0