Upgrade to Celery 3.0

This commit is contained in:
2012-08-06 21:10:37 +01:00
parent 1265eb704f
commit 7d50743a4d
3 changed files with 11 additions and 14 deletions

View File

@@ -105,10 +105,7 @@ EVE_PROXY_CACHE_ADJUSTMENTS = {
from celeryschedule import * from celeryschedule import *
CELERY_SEND_TASK_ERROR_EMAILS = True
CELERY_RESULT_BACKEND = "amqp"
CELERY_DISABLE_RATE_LIMITS = True CELERY_DISABLE_RATE_LIMITS = True
CELERYD_PREFETCH_MULTIPLIER = 128
CELERY_ALWAYS_EAGER = DEBUG CELERY_ALWAYS_EAGER = DEBUG
CELERY_EAGER_PROPAGATES_EXCEPTIONS = DEBUG CELERY_EAGER_PROPAGATES_EXCEPTIONS = DEBUG
CELERYD_HIJACK_ROOT_LOGGER = False CELERYD_HIJACK_ROOT_LOGGER = False

8
fabfile.py vendored
View File

@@ -118,7 +118,7 @@ def start_celeryd():
clear_logs() clear_logs()
with cd('%(path)s' % env): with cd('%(path)s' % env):
with prefix('source %(path)s/.env/bin/activate' % env): with prefix('source %(path)s/.env/bin/activate' % env):
run('app/manage.py celeryd_multi start %(celeryconf)s' % env) run('app/manage.py celery multi start %(celeryconf)s' % env)
@task @task
def stop_celeryd(): def stop_celeryd():
@@ -129,7 +129,7 @@ def stop_celeryd():
with cd('%(path)s' % env): with cd('%(path)s' % env):
with prefix('source %(path)s/.env/bin/activate' % env): with prefix('source %(path)s/.env/bin/activate' % env):
run('app/manage.py celeryd_multi stop %(celeryconf)s' % env) run('app/manage.py celery multi stop %(celeryconf)s' % env)
@task @task
@@ -137,14 +137,14 @@ def restart_celeryd():
"""Restart the celery daemon""" """Restart the celery daemon"""
with cd('%(path)s' % env): with cd('%(path)s' % env):
with prefix('source %(path)s/.env/bin/activate' % env): with prefix('source %(path)s/.env/bin/activate' % env):
run('app/manage.py celeryd_multi restart %(celeryconf)s' % env) run('app/manage.py celery multi restart %(celeryconf)s' % env)
@task @task
def show_celeryd(): def show_celeryd():
with cd('%(path)s' % env): with cd('%(path)s' % env):
with prefix('source %(path)s/.env/bin/activate' % env): with prefix('source %(path)s/.env/bin/activate' % env):
run('app/manage.py celeryd_multi show %(celeryconf)s' % env) run('app/manage.py celery multi show %(celeryconf)s' % env)
@task @task

View File

@@ -1,21 +1,21 @@
xmlrpclib==1.0.1 xmlrpclib
xmpppy xmpppy
dnspython dnspython
fabric fabric==dev
Django==1.4 Django==1.4.1
MySQL-python MySQL-python
Celery==2.5.3 Celery>=3.0
django-celery==2.5.5 django-celery>=3.0
django-jsonfield==0.8.7 django-jsonfield==0.8.7
South==0.7.4 South>=0.7
django-redis-cache django-redis-cache
IPy==0.75 IPy==0.75
-e git+https://github.com/nikdoof/django-braces.git@b573a69c06907cff74d3623f61a551ceb264cf08#egg=django-braces -e git+https://github.com/nikdoof/django-braces.git@b573a69c06907cff74d3623f61a551ceb264cf08#egg=django-braces
nexus nexus
gargoyle==0.9.0 gargoyle>=0.10
-e hg+https://bitbucket.org/jespern/django-piston@7c90898072ce#egg=django_piston -e hg+https://bitbucket.org/jespern/django-piston@7c90898072ce#egg=django_piston
-e hg+https://bitbucket.org/ubernostrum/django-registration@27bccd108cde#egg=django-registration -e hg+https://bitbucket.org/ubernostrum/django-registration@27bccd108cde#egg=django-registration
raven>=2.0.3 raven>=2.0.3