From 1cd71d359db80f335bffbace7c60f04531233a42 Mon Sep 17 00:00:00 2001 From: lijianguo Date: Sun, 5 Sep 2021 17:49:46 +0800 Subject: [PATCH] fix(controller): upgrade celery config --- rootfs/api/settings/celery.py | 23 ++++++++++++++++++++++- rootfs/api/settings/production.py | 18 ------------------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/rootfs/api/settings/celery.py b/rootfs/api/settings/celery.py index ff9128dd1..758b76675 100644 --- a/rootfs/api/settings/celery.py +++ b/rootfs/api/settings/celery.py @@ -1,9 +1,30 @@ import os from celery import Celery, platforms + +class Config: + # Celery Configuration Options + timezone = "Asia/Shanghai" + enable_utc = True + task_serializer = 'pickle' + accept_content = frozenset([ + 'application/data', + 'application/text', + 'application/json', + 'application/x-python-serialize', + ]) + task_track_started = True + task_time_limit = 30 * 60 + worker_max_tasks_per_child = 200 + result_expires = 24 * 60 * 60 + broker_url = os.environ.get('DRYCC_RABBITMQ_URL', 'amqp://guest:guest@127.0.0.1:5672/') # noqa + cache_backend = 'django-cache' + task_default_queue = 'priority.middle' + + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'api.settings.production') app = Celery('drycc') -app.config_from_object('django.conf:settings', namespace='CELERY') +app.config_from_object(Config) app.conf.update( task_routes={ 'api.tasks.retrieve_resource': {'queue': 'priority.high'}, diff --git a/rootfs/api/settings/production.py b/rootfs/api/settings/production.py index 6f40f77d6..07266a93b 100644 --- a/rootfs/api/settings/production.py +++ b/rootfs/api/settings/production.py @@ -469,24 +469,6 @@ } } -# Celery Configuration Options -timezone = "Asia/Shanghai" -enable_utc = True -task_serializer = 'pickle' -accept_content = frozenset([ - 'application/data', - 'application/text', - 'application/json', - 'application/x-python-serialize', -]) -task_track_started = True -task_time_limit = 30 * 60 -worker_max_tasks_per_child = 200 -result_expires = 24 * 60 * 60 -broker_url = os.environ.get('DRYCC_RABBITMQ_URL', 'amqp://guest:guest@127.0.0.1:5672/') # noqa -cache_backend = 'django-cache' -task_default_queue = 'priority.middle' - # Influxdb Configuration Options DRYCC_INFLUXDB_URL = os.environ.get('DRYCC_INFLUXDB_URL', 'http://localhost:8086') DRYCC_INFLUXDB_BUCKET = os.environ.get('DRYCC_INFLUXDB_BUCKET', 'drycc')