From 589be010004262c6cd76791e906a28408a44be1f Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 20 Feb 2021 23:00:52 +0100
Subject: [PATCH] working for 0.0.198 Release
---
src/config.py | 2 ++
.../application/application_workers.py | 18 +++++++++---------
src/database.py | 8 ++++++--
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/config.py b/src/config.py
index a067608f..02a4c965 100644
--- a/src/config.py
+++ b/src/config.py
@@ -3,6 +3,8 @@ CELERY_BROKER_URL = 'redis://localhost:6379/0'
MY_CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
CELERY_CONF_WORKER_SEND_TASK_EVENTS = True
CELERY_CONF_TASK_SEND_SENT_EVENT = True
+CELERY_LOG_REDIRECT = '1'
+CELERY_LOG_REDIRECT_LEVEL = 'INFO'
SQLALCHEMY_POSTGRES_USER = 'covid19data'
SQLALCHEMY_POSTGRES_PW = 'covid19datapwd'
SQLALCHEMY_POSTGRES_URL = 'localhost'
diff --git a/src/covid19/blueprints/application/application_workers.py b/src/covid19/blueprints/application/application_workers.py
index f5c5dd5f..a4a6c585 100644
--- a/src/covid19/blueprints/application/application_workers.py
+++ b/src/covid19/blueprints/application/application_workers.py
@@ -20,6 +20,9 @@ def run_mq(my_app, my_celery):
my_celery.start(args)
+celery = create_celery(app)
+
+
def run_app(my_app):
if sys.platform != 'linux':
my_app.logger.info("-------------------------------------------------------------")
@@ -32,17 +35,14 @@ def run_app(my_app):
my_app.logger.info("# Covid19 Data - WORKER #")
my_app.logger.info("#############################################################")
my_app.logger.info(" ")
- celery_cmd = ['celery', '-A', 'app.celery', 'worker', '-l', 'INFO']
- subprocess.Popen(celery_cmd, shell=True)
+ #celery_cmd = ['celery -A app.celery worker -l INFO']
+ celery_args = ['worker', '-l', 'INFO']
+ #subprocess.Popen(celery_cmd, shell=True, stdin=subprocess.PIPE, stderr=subprocess.PIPE)
+ my_celery = create_celery(app)
+ my_celery.start(celery_args)
my_app.logger.info(" ")
my_app.logger.info("#############################################################")
my_app.logger.info("# Covid19 Data - WEB #")
my_app.logger.info("#############################################################")
my_app.logger.info(" ")
- my_app.run(
- debug=run_run_with_debug,
- port=port
- )
-
-
-celery = create_celery(app)
+ my_app.run(debug=run_run_with_debug, port=port, threaded=False)
diff --git a/src/database.py b/src/database.py
index 58f5fcb3..bb75f6f6 100644
--- a/src/database.py
+++ b/src/database.py
@@ -1,10 +1,12 @@
-from flask import Flask
+import logging
+from flask import Flask, logging
from flask_cors import CORS
from flask_bs4 import Bootstrap
from flask_sqlalchemy import SQLAlchemy
from logging.config import dictConfig
from flask_admin import Admin
from celery import Celery
+from celery.utils.log import LoggingProxy
def create_app():
@@ -42,7 +44,9 @@ def create_celery(my_app):
broker=my_app.config['CELERY_BROKER_URL'],
worker_send_task_events=my_app.config['CELERY_CONF_WORKER_SEND_TASK_EVENTS'],
task_send_sent_event=my_app.config['CELERY_CONF_TASK_SEND_SENT_EVENT'],
- broker_transport_options={'visibility_timeout': 18000, 'max_retries': 5}
+ broker_transport_options={'visibility_timeout': 18000, 'max_retries': 5},
+ set_as_current=False,
+ standalone_mode=True
)
celery.conf.update(my_app.config)
--
GitLab