Move logger construction into Database base class

Author: krivard

src/acquisition/covid_hosp/common/database.py

@@ -11,6 +11,7 @@
 
 # first party
 import delphi.operations.secrets as secrets
+from delphi.epidata.acquisition.common.logger import get_structured_logger
 
 Columndef = namedtuple("Columndef", "csv_name sql_name dtype")
 
@@ -53,6 +54,10 @@ def __init__(self,
     self.key_columns = key_columns if key_columns is not None else []
     self.additional_fields = additional_fields if additional_fields is not None else []
 
+  @classmethod
+  def logger(database_class):
+    return get_structured_logger(f"{database_class.__module__}")
+
   @classmethod
   @contextmanager
   def connect(database_class, mysql_connector_impl=mysql.connector):
@@ -269,5 +274,5 @@ def get_max_issue(self, logger=False):
         if result is not None:
           return pd.Timestamp(str(result))
       if logger:
-        logger.info("get_max_issue", msg="no matching results in meta table; returning 1900/1/1 epoch")
+        logger.warn("get_max_issue", msg="no matching results in meta table; returning 1900/1/1 epoch")
       return pd.Timestamp("1900/1/1")

src/acquisition/covid_hosp/common/utils.py

@@ -6,7 +6,6 @@
 
 import pandas as pd
 
-from delphi.epidata.acquisition.common.logger import get_structured_logger
 
 class CovidHospException(Exception):
   """Exception raised exclusively by `covid_hosp` utilities."""
@@ -187,7 +186,7 @@ def update_dataset(database, network, newer_than=None, older_than=None):
     bool
       Whether a new dataset was acquired.
     """
-    logger = get_structured_logger(f"{database.__module__}.{database.__name__}.update_dataset")
+    logger = database.logger()
 
     metadata = network.fetch_metadata(logger=logger)
     datasets = []

tests/acquisition/covid_hosp/common/test_utils.py

@@ -97,7 +97,7 @@ def test_run_skip_old_dataset(self):
     mock_network = MagicMock()
     mock_network.fetch_metadata.return_value = \
         self.test_utils.load_sample_metadata()
-    mock_database = MagicMock(**{"__module__":"test_module", "__name__":"test_name"})
+    mock_database = MagicMock()
     with mock_database.connect() as mock_connection:
       pass
     mock_connection.get_max_issue.return_value = pd.Timestamp("2200/1/1")
@@ -117,7 +117,7 @@ def test_run_acquire_new_dataset(self):
         self.test_utils.load_sample_metadata()
     fake_dataset = pd.DataFrame({"date": [pd.Timestamp("2020/1/1")], "state": ["ca"]})
     mock_network.fetch_dataset.return_value = fake_dataset
-    mock_database = MagicMock(**{"__module__":"test_module", "__name__":"test_name"})
+    mock_database = MagicMock()
     with mock_database.connect() as mock_connection:
       pass
     type(mock_connection).KEY_COLS = PropertyMock(return_value=["state", "date"])