Refactor of caching & data storage part 12 #118

core/data_store.py

@@ -20,11 +20,15 @@ class DataStore:
         self._MAX_SPOT_COUNT = 100000
         self._MAX_ALERT_COUNT = 100000
         self._SPOT_ALERT_SNAPSHOT_INTERVAL_SEC = 300
-        self._CALLSIGN_DATA_TTL_SEC = 30 * 24 * 60 * 60
+        self.CALLSIGN_DATA_TTL_SEC = 30 * 24 * 60 * 60
         # Caches
         self.alerts = None
         self.spots = None
-        self.callsigns = None
+        self.callsign_data_countryfiles = None
+        self.callsign_data_clublogxml = None
+        self.callsign_data_clublogapi = None
+        self.callsign_data_qrz = None
+        self.callsign_data_hamqth = None
         self.dxcc_data = None
         self.dxcc_lookup_by_call_regex = []
         self.sigrefs = None
@@ -65,8 +69,16 @@ class DataStore:
         # Standard disk cache for callsign data. This data does have a TTL to trigger an occasional re-lookup.
         # Old data *is* better than no data, but we can't have a background thread re-looking-up every callsign
         # we've seen, so we rely on them timing out and this triggering another lookup.
-        self.callsigns = diskcache.Cache(CACHE_DIR + "callsigns")
-        logging.info(f"Loaded data for %d callsigns.", len(self.callsigns))
+        self.callsign_data_countryfiles = diskcache.Cache(CACHE_DIR + "callsign_data_countryfiles")
+        self.callsign_data_clublogxml = diskcache.Cache(CACHE_DIR + "callsign_data_clublogxml")
+        self.callsign_data_clublogapi = diskcache.Cache(CACHE_DIR + "callsign_data_clublogapi")
+        self.callsign_data_qrz = diskcache.Cache(CACHE_DIR + "callsign_data_qrz")
+        self.callsign_data_hamqth = diskcache.Cache(CACHE_DIR + "callsign_data_hamqth")
+        unique_keys = set()
+        for c in [self.callsign_data_countryfiles, self.callsign_data_clublogxml, self.callsign_data_clublogapi,
+                  self.callsign_data_qrz, self.callsign_data_hamqth]:
+            unique_keys.update(c)
+        logging.info(f"Loaded data for %d callsigns.", len(unique_keys))
 
         # Special caches for spots and alerts, which have TTL and write snapshots to disk at an interval. We
         # specifically load these caches *last* so that any sigref and callsign data is already loaded from disk cache
@@ -97,7 +109,11 @@ class DataStore:
         self._status.close()
         self.dxcc_data.close()
         self.sigrefs.close()
-        self.callsigns.close()
+        self.callsign_data_countryfiles.close()
+        self.callsign_data_clublogxml.close()
+        self.callsign_data_clublogapi.close()
+        self.callsign_data_qrz.close()
+        self.callsign_data_hamqth.close()
 
 # Global object
 DATA_STORE = DataStore()

core/sig_lookup_helper.py

@@ -86,7 +86,9 @@ def populate_sig_ref_info(sig_ref):
                 if value is not None and sig_ref.__dict__.get(key) is None:
                     sig_ref.__dict__[key] = value
         else:
-            logging.warning("%s database did not contain data for ref %s", sig, ref_id)
+            # Maybe a super new reference we don't know about yet, but more likely a typo or a test reference,
+            # just silently ignore it.
+            logging.debug("%s database did not contain data for ref %s", sig, ref_id)
 
     except Exception:
         logging.error("Exception when looking up sig_ref info for " + sig + " ref " + ref_id, exc_info=True)