diff --git a/app/conf/common.py b/app/conf/common.py index 648f73c..f615561 100644 --- a/app/conf/common.py +++ b/app/conf/common.py @@ -105,10 +105,7 @@ EVE_PROXY_CACHE_ADJUSTMENTS = { from celeryschedule import * -CELERY_SEND_TASK_ERROR_EMAILS = True -CELERY_RESULT_BACKEND = "amqp" CELERY_DISABLE_RATE_LIMITS = True -CELERYD_PREFETCH_MULTIPLIER = 128 CELERY_ALWAYS_EAGER = DEBUG CELERY_EAGER_PROPAGATES_EXCEPTIONS = DEBUG CELERYD_HIJACK_ROOT_LOGGER = False diff --git a/fabfile.py b/fabfile.py index 74d0b91..b6bf3f0 100644 --- a/fabfile.py +++ b/fabfile.py @@ -118,7 +118,7 @@ def start_celeryd(): clear_logs() with cd('%(path)s' % 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 def stop_celeryd(): @@ -129,7 +129,7 @@ def stop_celeryd(): with cd('%(path)s' % 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 @@ -137,14 +137,14 @@ def restart_celeryd(): """Restart the celery daemon""" with cd('%(path)s' % 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 def show_celeryd(): with cd('%(path)s' % 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 diff --git a/requirements.txt b/requirements.txt index 0b10553..464f16e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,21 +1,21 @@ -xmlrpclib==1.0.1 +xmlrpclib xmpppy dnspython -fabric +fabric==dev -Django==1.4 +Django==1.4.1 MySQL-python -Celery==2.5.3 -django-celery==2.5.5 +Celery>=3.0 +django-celery>=3.0 django-jsonfield==0.8.7 -South==0.7.4 +South>=0.7 django-redis-cache IPy==0.75 -e git+https://github.com/nikdoof/django-braces.git@b573a69c06907cff74d3623f61a551ceb264cf08#egg=django-braces 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/ubernostrum/django-registration@27bccd108cde#egg=django-registration raven>=2.0.3