diff --git a/covid19/oodm/rki/rki_service_import.py b/covid19/oodm/rki/rki_service_import.py index acea710af3182edd836f1def906b8f55f714787d..e5f8a16406dfd441d419ae1dced247fdf5201a64 100644 --- a/covid19/oodm/rki/rki_service_import.py +++ b/covid19/oodm/rki/rki_service_import.py @@ -5,7 +5,7 @@ import psycopg2 from database import db, app -from covid19.oodm.who.who_model import WhoGlobalDataImportTable +from covid19.oodm.who.who_model_import import WhoGlobalDataImportTable class RkiServiceImport: diff --git a/covid19/oodm/vaccination/vaccination_service.py b/covid19/oodm/vaccination/vaccination_service.py index f3c6efdd6e4ec51278ad22af0ef7cfa9125eab7b..90e090069f874243ae817e987edb3ebf7acbd3ac 100644 --- a/covid19/oodm/vaccination/vaccination_service.py +++ b/covid19/oodm/vaccination/vaccination_service.py @@ -1,24 +1,19 @@ -import os - from database import app from covid19.oodm.vaccination.vaccination_service_download import VaccinationServiceDownload from covid19.oodm.vaccination.vaccination_service_import import VaccinationServiceImport +from covid19.oodm.vaccination.vaccination_service_config import VaccinationServiceDownloadConfig class VaccinationService: def __init__(self, database): - app.logger.info("------------------------------------------------------------") - app.logger.info(" Vaccination Service [init]") - app.logger.info("------------------------------------------------------------") + app.logger.debug("------------------------------------------------------------") + app.logger.debug(" Vaccination Service [init]") + app.logger.debug("------------------------------------------------------------") self.__database = database - self.limit_nr = 20 - self.__cvsfile_name = "germany_vaccinations_timeseries_v2.tsv" - self.__src_cvsfile_name = "data"+os.sep+self.__cvsfile_name - self.__src_cvsfile_tmp_name = "data"+os.sep+"tmp_"+self.__cvsfile_name - self.__url_src_data = "https://impfdashboard.de/static/data/germany_vaccinations_timeseries_v2.tsv" + self.cfg = VaccinationServiceDownloadConfig() self.vaccination_service_download = VaccinationServiceDownload(database) self.vaccination_service_import = VaccinationServiceImport(database) - app.logger.info("------------------------------------------------------------") + app.logger.debug("------------------------------------------------------------") app.logger.info(" Vaccination Service [ready]") def run_download(self): diff --git a/covid19/oodm/vaccination/vaccination_service_download.py b/covid19/oodm/vaccination/vaccination_service_download.py index 0bd9145f854223a76985a5e5027fb9b5c5748c7b..0ef205ae1b95dd0d9a5b5061d23dc622d681fbf5 100644 --- a/covid19/oodm/vaccination/vaccination_service_download.py +++ b/covid19/oodm/vaccination/vaccination_service_download.py @@ -7,13 +7,13 @@ from covid19.oodm.vaccination.vaccination_service_config import VaccinationServi class VaccinationServiceDownload: def __init__(self, database): - app.logger.info("------------------------------------------------------------") - app.logger.info(" Vaccination Service Download [init]") - app.logger.info("------------------------------------------------------------") + app.logger.debug("------------------------------------------------------------") + app.logger.debug(" Vaccination Service Download [init]") + app.logger.debug("------------------------------------------------------------") self.__database = database self.cfg = VaccinationServiceDownloadConfig() - app.logger.info("------------------------------------------------------------") - app.logger.info(" Vaccination Service Download [ready]") + app.logger.debug("------------------------------------------------------------") + app.logger.debug(" Vaccination Service Download [ready]") def download_file(self): app.logger.info(" download - Vaccination [begin] ") @@ -27,19 +27,19 @@ class VaccinationServiceDownload: data_file = wget.download(self.cfg.url_src_data, self.cfg.cvsfile_path) app.logger.info(" " + data_file + " ") except RuntimeError as error: - app.logger.info("############################################################") - app.logger.info(" " + error + " ") - app.logger.info("############################################################") + app.logger.error("############################################################") + app.logger.error(" " + error + " ") + app.logger.error("############################################################") flash(message="error while downloading: " + self.cfg.cvsfile_path, category='error') except AttributeError as attribute_error: - app.logger.info("############################################################") - app.logger.info(attribute_error) - app.logger.info("############################################################") + app.logger.error("############################################################") + app.logger.error(attribute_error) + app.logger.error("############################################################") flash(message="error after downloading: " + self.cfg.cvsfile_path, category='error') except Exception as error: - app.logger.info("############################################################") - app.logger.info(error) - app.logger.info("############################################################") + app.logger.error("############################################################") + app.logger.error(error) + app.logger.error("############################################################") flash(message="error after downloading: " + self.cfg.cvsfile_path, category='error') finally: app.logger.info("------------------------------------------------------------") diff --git a/covid19/oodm/vaccination/vaccination_service_import.py b/covid19/oodm/vaccination/vaccination_service_import.py index d185672a9c7c9bf4addb3a79a32b604ffaac3991..c0ecb49c8a657993a8368664427c5704d877dd1e 100644 --- a/covid19/oodm/vaccination/vaccination_service_import.py +++ b/covid19/oodm/vaccination/vaccination_service_import.py @@ -9,14 +9,14 @@ from covid19.oodm.vaccination.vaccination_service_config import VaccinationServi class VaccinationServiceImport: def __init__(self, database): - app.logger.info("------------------------------------------------------------") - app.logger.info(" Vaccination Service Import [init]") - app.logger.info("------------------------------------------------------------") + app.logger.debug("------------------------------------------------------------") + app.logger.debug(" Vaccination Service Import [init]") + app.logger.debug("------------------------------------------------------------") self.__database = database self.cfg = VaccinationServiceDownloadConfig() self.__url_src_data = "https://impfdashboard.de/static/data/germany_vaccinations_timeseries_v2.tsv" - app.logger.info("------------------------------------------------------------") - app.logger.info(" Vaccination Service Import [ready]") + app.logger.debug("------------------------------------------------------------") + app.logger.debug(" Vaccination Service Import [ready]") def import_file(self): src_cvsfile_name = self.cfg.data_path+os.sep+self.cfg.cvsfile_name