From f1ffcb15d8fd7eb3f8450a9f7f1377f611f51433 Mon Sep 17 00:00:00 2001
From: "thomas.woehlke" <thomas.woehlke@rub.de>
Date: Sun, 24 Jan 2021 16:32:33 +0100
Subject: [PATCH] work 24.01.2021
---
app.py | 14 +++++++-------
server_mq.py => app_mq.py | 19 ++++++++++++-------
config.py | 3 +++
database.py | 2 +-
setup.py | 5 ++---
start_server_mq.sh | 4 ++--
6 files changed, 27 insertions(+), 20 deletions(-)
rename server_mq.py => app_mq.py (90%)
diff --git a/app.py b/app.py
index 18460692..f1079649 100644
--- a/app.py
+++ b/app.py
@@ -1,7 +1,7 @@
from logging.config import dictConfig
from flask import render_template, redirect, url_for, flash
from sqlalchemy.exc import OperationalError
-from database import db, app, my_logging_config
+from database import db, app, my_logging_config, run_run_with_debug
from org.woehlke.covid19.who.who_model import WhoGlobalDataImportTable
from org.woehlke.covid19.who.who_model import WhoRegion, WhoCountry, WhoDateReported, WhoGlobalData
from org.woehlke.covid19.who.who_service import WhoService
@@ -11,11 +11,11 @@ from org.woehlke.covid19.europe.europe_service import EuropeService
from org.woehlke.covid19.vaccination.vaccination_service import VaccinationService
from org.woehlke.covid19.vaccination.vaccination_model import VaccinationDataImportTable
from org.woehlke.covid19.admin.admin_service import AdminService
-from server_mq import who_run_update_task, who_update_short_task, who_update_initial_task
-from server_mq import alive_message_task
-from server_mq import europe_update_initial_task
-from server_mq import vaccination_update_initial_task
-from server_mq import admin_database_drop_create_task
+from app_mq import who_run_update_task, who_update_short_task, who_update_initial_task
+from app_mq import alive_message_task
+from app_mq import europe_update_initial_task
+from app_mq import vaccination_update_initial_task
+from app_mq import admin_database_drop_create_task
drop_and_create_data_again = True
@@ -592,4 +592,4 @@ if __name__ == '__main__':
europe_service = EuropeService(db)
vaccination_service = VaccinationService(db)
admin_service = AdminService(db)
- app.run(debug=True)
+ app.run(debug=run_run_with_debug)
diff --git a/server_mq.py b/app_mq.py
similarity index 90%
rename from server_mq.py
rename to app_mq.py
index ae73b2bd..0c4bf02d 100644
--- a/server_mq.py
+++ b/app_mq.py
@@ -8,17 +8,12 @@ from org.woehlke.covid19.vaccination.vaccination_service import VaccinationServi
from org.woehlke.covid19.admin.admin_service import AdminService
-who_service = WhoService(db)
-europe_service = EuropeService(db)
-vaccination_service = VaccinationService(db)
-admin_service = AdminService(db)
-#
celery = Celery(app.name, broker=app.config['CELERY_BROKER_URL'])
celery.conf.update(app.config)
celery.conf.result_backend = app.config['CELERY_BROKER_URL']
celery.conf.broker_transport_options = {'visibility_timeout': 18000, 'max_retries': 5}
-celery.conf.worker_send_task_events = True
-celery.conf.task_send_sent_event = True
+celery.conf.worker_send_task_events = app.config['CELERY_CONF_WORKER_SEND_TASK_EVENTS']
+celery.conf.task_send_sent_event = app.config['CELERY_CONF_TASK_SEND_SENT_EVENT']
@celery.task(bind=True)
@@ -114,4 +109,14 @@ def admin_database_drop_create_task(self):
return result
+if __name__ == '__main__':
+ db.create_all()
+ dictConfig(my_logging_config)
+ who_service = WhoService(db)
+ europe_service = EuropeService(db)
+ vaccination_service = VaccinationService(db)
+ admin_service = AdminService(db)
+ args = ['worker', '-l', 'INFO']
+ celery.start(args)
+
diff --git a/config.py b/config.py
index ee55c5be..b56c00dd 100644
--- a/config.py
+++ b/config.py
@@ -5,3 +5,6 @@ POSTGRES_DB = 'covid19data'
ITEMS_PER_PAGE = 10
CELERY_BROKER_URL = 'redis://localhost:6379/0'
SECRET_KEY='vfdjv423ndf654&%%'
+APP_DEBUGGER_ACTIVE = True
+CELERY_CONF_WORKER_SEND_TASK_EVENTS = True
+CELERY_CONF_TASK_SEND_SENT_EVENT = True
diff --git a/database.py b/database.py
index 8cf1d6ee..8cbd019f 100644
--- a/database.py
+++ b/database.py
@@ -14,7 +14,7 @@ DB_URL = 'postgresql+psycopg2://{user}:{pw}@{url}/{db}'.format(
app.config['SQLALCHEMY_DATABASE_URI'] = DB_URL
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False # silence the deprecation warning
db = SQLAlchemy(app)
-
+run_run_with_debug = app.config['APP_DEBUGGER_ACTIVE']
my_logging_config = {
'version': 1,
'formatters': {'default': {
diff --git a/setup.py b/setup.py
index 6900b2cf..f43623da 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,9 @@
-from setuptools import setup
+from setuptools import setup, find_packages
setup(
name='covid19python',
version='0.0.11',
- packages=['org', 'org.woehlke', 'org.woehlke.covid19', 'org.woehlke.covid19.nrw', 'org.woehlke.covid19.rki',
- 'org.woehlke.covid19.who', 'org.woehlke.covid19.admin', 'org.woehlke.covid19.europe'],
+ packages=find_packages(),
url='https://github.com/thomaswoehlke/covid19python',
license='GNU General Public License v3.0',
author='thomaswoehlke',
diff --git a/start_server_mq.sh b/start_server_mq.sh
index c165344a..70b9da95 100644
--- a/start_server_mq.sh
+++ b/start_server_mq.sh
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
-python server_mq.py
-celery -A server_mq.celery worker -l INFO
+python app_mq.py
+celery -A app_mq.celery worker -l INFO
--
GitLab