diff --git a/src/covid19/blueprints/admin/admin_service.py b/src/covid19/blueprints/admin/admin_service.py
index f35a29ce222e386cef671222f261bfe9412aa7cb..dc43f986abec5626f5c43553ad43507e3f299cb3 100644
--- a/src/covid19/blueprints/admin/admin_service.py
+++ b/src/covid19/blueprints/admin/admin_service.py
@@ -16,7 +16,9 @@ class AdminService:
app.logger.info(" Admin Service [ready]")
def task_database_drop_create(self):
+ app.logger.info(" AdminService.task_database_drop_create() [begin]")
self.run_admin_database_dump()
+ app.logger.info(" AdminService.task_database_drop_create() [begin]")
return self
def run_admin_database_dump(self):
@@ -69,7 +71,7 @@ class AdminService:
app.logger.info("------------------------------------------------------------")
return self
- def run_admin_database_drop(self):
+ def run_admin_database_drop_and_create(self):
app.logger.info(" run database drop and create [begin]")
app.logger.info("------------------------------------------------------------")
self.__database.drop_all()
diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py
index 88f94557620ea16b2451bb6eea6661fe051ab384..18dba9452697e5d7f8fff72286a5691f146d9c90 100644
--- a/src/covid19/blueprints/admin/admin_views.py
+++ b/src/covid19/blueprints/admin/admin_views.py
@@ -241,7 +241,7 @@ def url_admin_database_dump_reimport():
def url_admin_database_dropcreate_only():
app.logger.info("url_admin_database_drop [start]")
flash("admin_service.run_admin_database_drop started")
- admin_service.run_admin_database_drop()
+ admin_service.run_admin_database_drop_and_create()
app.logger.info("url_admin_database_drop [done]")
return redirect(url_for('app_admin.url_admin_tasks'))
@@ -249,7 +249,7 @@ def url_admin_database_dropcreate_only():
@app_admin.route('/database/drop')
def url_admin_database_drop():
app.logger.info("url_admin_database_drop [start]")
- admin_service.run_admin_database_drop()
+ admin_service.run_admin_database_drop_and_create()
if drop_and_create_data_again:
who_service.pretask_database_drop_create()
ecdc_service.pretask_database_drop_create()
diff --git a/src/covid19/blueprints/ecdc/ecdc_service.py b/src/covid19/blueprints/ecdc/ecdc_service.py
index 1cd1b35c4bf231b1a7e47e3c35f5570a63d0e250..ead68848378b39a1165fb374309cb7712fd70fb2 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service.py
@@ -22,12 +22,17 @@ class EcdcService:
def pretask_database_drop_create(self):
flash("ecdc_service.download started")
+ app.logger.info("ecdc_service.download started")
self.service_download.download_file()
+ app.logger.info("ecdc_service.download done")
+ flash("ecdc_service.download done")
return self
def task_database_drop_create(self):
+ app.logger.info("ecdc_service.task_database_drop_create started")
self.service_import.import_file()
self.service_update.update_star_schema_initial()
+ app.logger.info("ecdc_service.task_database_drop_create done")
return self
def run_download_only(self):
diff --git a/src/covid19/blueprints/owid/owid_service.py b/src/covid19/blueprints/owid/owid_service.py
index 9e0d20b193e290c6e1a8a01029812c952ae88cef..524c5ef007dae9417ad84f1a501585973266e008 100644
--- a/src/covid19/blueprints/owid/owid_service.py
+++ b/src/covid19/blueprints/owid/owid_service.py
@@ -23,14 +23,19 @@ class OwidService:
def pretask_database_drop_create(self):
flash("OwidService.pretask_database_drop_create started")
+ app.logger.info("OwidService.pretask_database_drop_create started")
self.service_download.download_file()
+ app.logger.info("OwidService.pretask_database_drop_create done")
+ flash("OwidService.pretask_database_drop_create done")
return self
def task_database_drop_create(self):
+ app.logger.info("OwidService.task_database_drop_create started")
self.service_import.import_file()
# TODO #212 implement OwidService.task_database_drop_create()
self.service_update.update_dimension_tables_only()
self.service_update.update_fact_table_incremental_only()
+ app.logger.info("OwidService.task_database_drop_create done")
return self
#def run_download_only(self):
diff --git a/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service.py b/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service.py
index 021f75888f5855567f558982e5c2e2e52d9a600d..ac24c73ed5d8b29f105d199fa1c27dfbc140efcd 100644
--- a/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service.py
+++ b/src/covid19/blueprints/rki/rki_bundeslaender/rki_bundeslaender_service.py
@@ -22,12 +22,17 @@ class RkiBundeslaenderService:
def pretask_database_drop_create(self):
flash("RkiBundeslaenderService.pretask_database_drop_create started")
+ app.logger.info("RkiBundeslaenderService.pretask_database_drop_create started")
self.service_download.download_file()
+ app.logger.info("RkiBundeslaenderService.pretask_database_drop_create done")
+ flash("RkiBundeslaenderService.pretask_database_drop_create done")
return self
def task_database_drop_create(self):
+ app.logger.info("RkiBundeslaenderService.task_database_drop_create started")
self.service_import.import_file()
self.service_update.update_star_schema_initial()
+ app.logger.info("RkiBundeslaenderService.task_database_drop_create done")
return self
def run_download_only(self):
diff --git a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service.py b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service.py
index e300f9ffb9f1af62624116f2792613446388e9d3..72dd2f67d381390dfaa8f4b2534e4285427899d3 100644
--- a/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service.py
+++ b/src/covid19/blueprints/rki/rki_vaccination/rki_vaccination_service.py
@@ -22,12 +22,17 @@ class RkiVaccinationService:
def pretask_database_drop_create(self):
flash("vaccination_service.run_download started")
+ app.logger.info("vaccination_service.run_download started")
self.service_download.download_file()
+ app.logger.info("vaccination_service.run_download done")
+ flash("vaccination_service.run_download done")
return self
def task_database_drop_create(self):
+ app.logger.info("vaccination_service.task_database_drop_create started")
self.service_import.import_file()
self.service_update.update_star_schema_initial()
+ app.logger.info("vaccination_service.task_database_drop_create done")
return self
def run_download_only(self):
diff --git a/src/covid19/blueprints/who/who_service.py b/src/covid19/blueprints/who/who_service.py
index 9a9f68827ae69f5026afbde443539359bc4bc82e..371869fd6c77445066feafec413b8024f97c9daf 100644
--- a/src/covid19/blueprints/who/who_service.py
+++ b/src/covid19/blueprints/who/who_service.py
@@ -22,13 +22,18 @@ class WhoService:
def pretask_database_drop_create(self):
flash("WhoService.pretask_database_drop_create started")
+ app.logger.info("WhoService.pretask_database_drop_create started")
self.service_download.download_file()
+ app.logger.info("WhoService.pretask_database_drop_create done")
+ flash("WhoService.pretask_database_drop_create done")
return self
def task_database_drop_create(self):
+ app.logger.info("WhoService.task_database_drop_create started")
self.service_import.import_file()
self.service_update.update_dimension_tables_only()
self.service_update.update_fact_table_incremental_only()
+ app.logger.info("WhoService.task_database_drop_create done")
return self
#def run_download_only(self):
diff --git a/src/covid19/blueprints/who/who_service_update.py b/src/covid19/blueprints/who/who_service_update.py
index 887f9ca36cdc47b266689c08077f4133b42591bf..f12a4e2923cfada6e1317a126c48915d25714764 100644
--- a/src/covid19/blueprints/who/who_service_update.py
+++ b/src/covid19/blueprints/who/who_service_update.py
@@ -118,7 +118,7 @@ class WhoServiceUpdate:
db.session.add(o)
i += 1
k += 1
- if i % 500 == 0:
+ if i % 1000 == 0:
app.logger.info(" update WHO incremental ... "+str(i)+" rows")
db.session.commit()
app.logger.info(" update WHO incremental ... " + str(i) + " rows [" + str(my_date) + "] (" + str(k) + ")")
@@ -153,7 +153,7 @@ class WhoServiceUpdate:
result_item.row_imported = True
db.session.add(result_item)
i += 1
- if i % 500 == 0:
+ if i % 1000 == 0:
app.logger.info(" update WHO initial ... "+str(i)+" rows")
db.session.commit()
db.session.commit()