From 04f3cb30459d2c2d461dc57e0d685f5efb54a4b8 Mon Sep 17 00:00:00 2001 From: esensar Date: Mon, 8 Oct 2018 21:08:50 +0200 Subject: [PATCH] Fix celery task runner and task import --- .env | 1 + Procfile | 2 +- app/celery_builder.py | 1 + app/devices/tasks.py | 4 ++-- config.py | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 30a3321..d744849 100644 --- a/.env +++ b/.env @@ -1,3 +1,4 @@ DATABASE_URL="postgresql://localhost" REDIS_URL=redis://localhost:6379 CELERY_TASK_SERIALIZER=json +DEBUG=True diff --git a/Procfile b/Procfile index f7dd9da..4f353a3 100644 --- a/Procfile +++ b/Procfile @@ -1,3 +1,3 @@ release: ./release-tasks.sh web: gunicorn app.core:app -w 4 --preload -worker: celery -A app.celery_builder.celery worker +worker: celery -A app.celery_builder.task_builder worker diff --git a/app/celery_builder.py b/app/celery_builder.py index e52afe9..9814f73 100644 --- a/app/celery_builder.py +++ b/app/celery_builder.py @@ -7,3 +7,4 @@ app.config.from_object('config') app.config.from_pyfile('config.py', silent=True) app.config['MQTT_CLIENT_ID'] = 'final-iot-backend-server-worker' task_builder = make_celery(app) +task_builder.autodiscover_tasks(['app.devices']) diff --git a/app/devices/tasks.py b/app/devices/tasks.py index 8a4bd41..5538157 100644 --- a/app/devices/tasks.py +++ b/app/devices/tasks.py @@ -1,12 +1,12 @@ import sys from app.celery_builder import task_builder -from .blueprint import devices_bp +from flask import current_app as app @task_builder.task() def send_config(device_id, config): from flask_mqtt import Mqtt, MQTT_ERR_SUCCESS - mqtt = Mqtt(devices_bp) + mqtt = Mqtt(app) @mqtt.on_log() def handle_logging(client, userdata, level, buf): diff --git a/config.py b/config.py index 55e4c11..fae5be1 100644 --- a/config.py +++ b/config.py @@ -1,7 +1,7 @@ import os # App configuration -DEBUG = False +DEBUG = os.environ['DEBUG'] # Define the application directory BASE_DIR = os.path.abspath(os.path.dirname(__file__))