From f173a6c4ccb71aced63b75942acb5258f0303f2d Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Mon, 26 Sep 2011 14:07:33 +0100 Subject: [PATCH] Added fastroute for user facing requests --- app/conf/celeryschedule.py | 4 +++- app/conf/development.py | 1 - fabfile.py | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/conf/celeryschedule.py b/app/conf/celeryschedule.py index fd7feba..7bea7ec 100644 --- a/app/conf/celeryschedule.py +++ b/app/conf/celeryschedule.py @@ -19,7 +19,7 @@ CELERYBEAT_SCHEDULE = { }, "blacklist-check": { "task": "hr.tasks.blacklist_check", - "schedule": timedelta(days=1), + "schedule": timedelta(days=7), }, "reddit-update": { "task": "reddit.tasks.queue_account_updates", @@ -30,4 +30,6 @@ CELERYBEAT_SCHEDULE = { CELERY_ROUTES = { "sso.tasks.update_service_groups": {'queue': 'bulk'}, "hr.tasks.blacklist_check": {'queue': 'bulk'}, + "eve_api.tasks.import_apikey_result": {'queue': 'fastresponse'}, + "sso.tasks.update_user_access": {'queue': 'fastresponse'}, } diff --git a/app/conf/development.py b/app/conf/development.py index 4f4757d..28ec1dd 100644 --- a/app/conf/development.py +++ b/app/conf/development.py @@ -51,4 +51,3 @@ MANAGERS = ADMINS CELERY_ALWAYS_EAGER = True CELERY_EAGER_PROPAGATES_EXCEPTIONS = True - diff --git a/fabfile.py b/fabfile.py index e668211..ea9ff92 100644 --- a/fabfile.py +++ b/fabfile.py @@ -19,7 +19,8 @@ def production(): env.uwsgiconfig = os.path.join(env.path, '..', 'etc', 'uwsgi', 'dreddit-auth.ini') env.password = sha1('%s-%s' % (env.user, env.vhost)).hexdigest() - env.celeryconf = '-l INFO --settings=%(config)s --pidfile=logs/%%n.pid --logfile=logs/%%n.log -n auth.pleaseignore.com bulk default -Q:bulk bulk -c 5 -c:bulk 3 -B:default' % env + env.celeryconf = '-l INFO --settings=%(config)s --pidfile=logs/%%n.pid --logfile=logs/%%n.log -n auth.pleaseignore.com bulk default fastresponse -Q:bulk bulk -Q:fastresponse fastresponse -c 5 -c:bulk 3 -c:fastresponse 3 -B --scheduler=djcelery.schedulers.DatabaseScheduler' % env + def test(): "Use the test enviroment on Web2" @@ -157,6 +158,7 @@ def stop_celeryd(): with cd('%(path)s/dreddit-auth/' % env): run('. env/bin/activate; app/manage.py celeryd_multi stop %(celeryconf)s' % env) + def kill_celeryd(): """ Kills all Celeryd instances @@ -164,7 +166,6 @@ def kill_celeryd(): with cd('%(path)s/dreddit-auth/' % env): run("ps auxww | grep celeryd | awk '{print $2}' | xargs kill -9") - def restart_celeryd(): """ Restart the celery daemon