diff --git a/harvester/cde_harvester/ERDDAP.py b/harvester/cde_harvester/ERDDAP.py index dfca0d1a..aac24c6a 100644 --- a/harvester/cde_harvester/ERDDAP.py +++ b/harvester/cde_harvester/ERDDAP.py @@ -53,7 +53,7 @@ def __init__(self, erddap, cache_requests=False): if not erddap_url.endswith("/erddap"): # ERDDAP URL almost always ends in /erddap - logger.warning("URL doesn't end in /erddap, trying anyway") + self.logger.warning("URL doesn't end in /erddap, trying anyway") self.df_all_datasets = self.get_all_datasets() @@ -100,7 +100,7 @@ def erddap_csv_to_df(self, url, skiprows=[1], dataset=None): def _cache_request(url): if self.cache_requests and url in self.cache: - logger.debug("load CACHE") + self.logger.debug("load CACHE") response = self.cache[url] if self.cache_requests == True: return response @@ -112,7 +112,7 @@ def _cache_request(url): response = self.session.get(url, timeout=3600) if self.cache_requests: - logger.debug("save CACHE") + self.logger.debug("save CACHE") self.cache[url] = response return response @@ -149,7 +149,7 @@ def _cache_request(url): and "Query error: No operator found in constraint="orderByCount" in response.text ): - self.self.logger.error( + self.logger.error( "OrderByCount not available within this ERDDAP Version" ) no_data = True diff --git a/harvester/cde_harvester/__main__.py b/harvester/cde_harvester/__main__.py index 6ee52bdf..ecc7fe99 100644 --- a/harvester/cde_harvester/__main__.py +++ b/harvester/cde_harvester/__main__.py @@ -38,7 +38,7 @@ def setup_logging(log_level): logger_format = ( "{time:YYYY-MM-DD HH:mm:ss.SSS} | " "{level: <8} | " - " {extra[erddap_url]} | {extra[dataset_id]} | " + " {extra[erddap_url]}/.../{extra[dataset_id]} | " "{name}:{function}:{line} | " "{message}" )