From 4c07c5d773806440ee59b624d8d831f0747d121d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Tue, 15 Jul 2014 19:10:42 +0200 Subject: [PATCH] [Tasks] Update Celery configuration / setup --- mygpo/administration/tasks.py | 2 +- mygpo/administration/views.py | 2 +- mygpo/api/tasks.py | 2 +- mygpo/cel.py | 28 ---------------------------- mygpo/celery.py | 9 +++++++++ mygpo/core/tasks.py | 2 +- mygpo/data/tasks.py | 2 +- mygpo/directory/tasks.py | 2 +- mygpo/settings.py | 16 ++++------------ mygpo/users/tasks.py | 2 +- 10 files changed, 20 insertions(+), 47 deletions(-) delete mode 100644 mygpo/cel.py create mode 100644 mygpo/celery.py diff --git a/mygpo/administration/tasks.py b/mygpo/administration/tasks.py index 708ba67b..836222a2 100644 --- a/mygpo/administration/tasks.py +++ b/mygpo/administration/tasks.py @@ -1,7 +1,7 @@ from collections import Counter from mygpo.podcasts.models import Podcast -from mygpo.cel import celery +from mygpo.celery import celery from mygpo.maintenance.merge import PodcastMerger from celery.utils.log import get_task_logger diff --git a/mygpo/administration/views.py b/mygpo/administration/views.py index 22556580..f5480552 100644 --- a/mygpo/administration/views.py +++ b/mygpo/administration/views.py @@ -27,7 +27,7 @@ from mygpo.administration.clients import UserAgentStats, ClientStats from mygpo.administration.tasks import merge_podcasts from mygpo.utils import get_git_head from mygpo.api.httpresponse import JsonResponse -from mygpo.cel import celery +from mygpo.celery import celery from mygpo.db.couchdb import get_userdata_database from mygpo.db.couchdb.user import activate_user, add_published_objs diff --git a/mygpo/api/tasks.py b/mygpo/api/tasks.py index fedae160..f8955232 100644 --- a/mygpo/api/tasks.py +++ b/mygpo/api/tasks.py @@ -1,6 +1,6 @@ from celery.utils.log import get_task_logger -from mygpo.cel import celery +from mygpo.celery import celery from mygpo.api.advanced import update_episodes logger = get_task_logger(__name__) diff --git a/mygpo/cel.py b/mygpo/cel.py deleted file mode 100644 index 1c46aa02..00000000 --- a/mygpo/cel.py +++ /dev/null @@ -1,28 +0,0 @@ -from __future__ import absolute_import - -from django.conf import settings - -from celery import Celery - -import sys -import os - - -celery = Celery('mygpo.celery', - broker=settings.BROKER_URL, - backend=settings.CELERY_RESULT_BACKEND, - include=[ - 'mygpo.core.tasks', - 'mygpo.api.tasks', - 'mygpo.users.tasks', - 'mygpo.data.tasks', - 'mygpo.administration.tasks', - 'mygpo.directory.tasks', - ]) - -celery.conf.update( - **settings.CELERY_CONF -) - -if __name__ == '__main__': - celery.start() diff --git a/mygpo/celery.py b/mygpo/celery.py new file mode 100644 index 00000000..6ee0dc3d --- /dev/null +++ b/mygpo/celery.py @@ -0,0 +1,9 @@ +from __future__ import absolute_import + +from django.conf import settings + +from celery import Celery + +celery = Celery('mygpo.celery') +celery.config_from_object('django.conf:settings') +celery.autodiscover_tasks(lambda: settings.INSTALLED_APPS) diff --git a/mygpo/core/tasks.py b/mygpo/core/tasks.py index 1cab3b3e..4047a8df 100644 --- a/mygpo/core/tasks.py +++ b/mygpo/core/tasks.py @@ -4,7 +4,7 @@ from django.utils.translation import ugettext as _ from django.conf import settings from mygpo.podcasts.models import Podcast, Episode -from mygpo.cel import celery +from mygpo.celery import celery from mygpo.data.feeddownloader import PodcastUpdater from mygpo.utils import get_timestamp from mygpo.users.models import EpisodeAction diff --git a/mygpo/data/tasks.py b/mygpo/data/tasks.py index edd62ea4..99ee586a 100644 --- a/mygpo/data/tasks.py +++ b/mygpo/data/tasks.py @@ -1,4 +1,4 @@ -from mygpo.cel import celery +from mygpo.celery import celery from mygpo.data.feeddownloader import PodcastUpdater diff --git a/mygpo/directory/tasks.py b/mygpo/directory/tasks.py index df5608e9..37d02b44 100644 --- a/mygpo/directory/tasks.py +++ b/mygpo/directory/tasks.py @@ -1,5 +1,5 @@ from mygpo.podcasts.models import Podcast -from mygpo.cel import celery +from mygpo.celery import celery from mygpo.db.couchdb.podcast_state import podcast_subscriber_count diff --git a/mygpo/settings.py b/mygpo/settings.py index 2fb72209..ac527061 100644 --- a/mygpo/settings.py +++ b/mygpo/settings.py @@ -139,7 +139,6 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', 'django_couchdb_utils.couchauth', 'django_couchdb_utils.registration', - 'djcelery', 'mygpo.core', 'mygpo.podcasts', 'mygpo.search', @@ -159,7 +158,7 @@ INSTALLED_APPS = ( try: import debug_toolbar - INSTALLED_APPS += ('debug_toolbar.apps.DebugToolbarConfig', ) + INSTALLED_APPS += ('debug_toolbar', ) except ImportError: print >> sys.stderr, 'Could not load django-debug-toolbar' @@ -302,16 +301,9 @@ DEFAULT_BASE_URL = '' BROKER_URL='redis://localhost' CELERY_RESULT_BACKEND='redis://localhost' -import djcelery -djcelery.setup_loader() - -# a dictionary containing celery settings from -# http://docs.celeryproject.org/en/latest/configuration.html -CELERY_CONF = dict( - CELERY_SEND_TASK_ERROR_EMAILS = True, - ADMINS=ADMINS, - SERVER_EMAIL = "no-reply@example.com", -) +CELERY_SEND_TASK_ERROR_EMAILS = True, +ADMINS=ADMINS, +SERVER_EMAIL = "no-reply@example.com", ### Google API diff --git a/mygpo/users/tasks.py b/mygpo/users/tasks.py index c6576912..16b15f4d 100644 --- a/mygpo/users/tasks.py +++ b/mygpo/users/tasks.py @@ -4,7 +4,7 @@ from collections import Counter from couchdbkit import ResourceConflict -from mygpo.cel import celery +from mygpo.celery import celery from mygpo.db.couchdb.user import (suggestions_for_user, update_device_state, update_suggestions, ) from mygpo.decorators import repeat_on_conflict -- 2.11.4.GIT