Commit cfa1e837 by Bach Dániel

Merge branch 'feature-fix-celery' into 'master'

Feature fix celery 

See merge request !299
parents 871a5a23 31e4886b
...@@ -22,7 +22,6 @@ from kombu import Queue, Exchange ...@@ -22,7 +22,6 @@ from kombu import Queue, Exchange
from os import getenv from os import getenv
HOSTNAME = "localhost" HOSTNAME = "localhost"
CACHE_URI = getenv("CACHE_URI", "pylibmc://127.0.0.1:11211/")
QUEUE_NAME = HOSTNAME + '.man' QUEUE_NAME = HOSTNAME + '.man'
...@@ -38,8 +37,7 @@ celery = Celery('manager', ...@@ -38,8 +37,7 @@ celery = Celery('manager',
]) ])
celery.conf.update( celery.conf.update(
CELERY_RESULT_BACKEND='cache', CELERY_RESULT_BACKEND='amqp',
CELERY_CACHE_BACKEND=CACHE_URI,
CELERY_TASK_RESULT_EXPIRES=300, CELERY_TASK_RESULT_EXPIRES=300,
CELERY_QUEUES=( CELERY_QUEUES=(
Queue(HOSTNAME + '.man', Exchange('manager', type='direct'), Queue(HOSTNAME + '.man', Exchange('manager', type='direct'),
......
...@@ -22,7 +22,6 @@ from kombu import Queue, Exchange ...@@ -22,7 +22,6 @@ from kombu import Queue, Exchange
from os import getenv from os import getenv
HOSTNAME = "localhost" HOSTNAME = "localhost"
CACHE_URI = getenv("CACHE_URI", "pylibmc://127.0.0.1:11211/")
QUEUE_NAME = HOSTNAME + '.monitor' QUEUE_NAME = HOSTNAME + '.monitor'
celery = Celery('monitor', celery = Celery('monitor',
...@@ -32,8 +31,7 @@ celery = Celery('monitor', ...@@ -32,8 +31,7 @@ celery = Celery('monitor',
]) ])
celery.conf.update( celery.conf.update(
CELERY_RESULT_BACKEND='cache', CELERY_RESULT_BACKEND='amqp',
CELERY_CACHE_BACKEND=CACHE_URI,
CELERY_TASK_RESULT_EXPIRES=300, CELERY_TASK_RESULT_EXPIRES=300,
CELERY_QUEUES=( CELERY_QUEUES=(
Queue(QUEUE_NAME, Exchange('monitor', type='direct'), Queue(QUEUE_NAME, Exchange('monitor', type='direct'),
......
...@@ -22,7 +22,6 @@ from kombu import Queue, Exchange ...@@ -22,7 +22,6 @@ from kombu import Queue, Exchange
from os import getenv from os import getenv
HOSTNAME = "localhost" HOSTNAME = "localhost"
CACHE_URI = getenv("CACHE_URI", "pylibmc://127.0.0.1:11211/")
QUEUE_NAME = HOSTNAME + '.man.slow' QUEUE_NAME = HOSTNAME + '.man.slow'
celery = Celery('manager.slow', celery = Celery('manager.slow',
...@@ -34,8 +33,7 @@ celery = Celery('manager.slow', ...@@ -34,8 +33,7 @@ celery = Celery('manager.slow',
]) ])
celery.conf.update( celery.conf.update(
CELERY_RESULT_BACKEND='cache', CELERY_RESULT_BACKEND='amqp',
CELERY_CACHE_BACKEND=CACHE_URI,
CELERY_TASK_RESULT_EXPIRES=300, CELERY_TASK_RESULT_EXPIRES=300,
CELERY_QUEUES=( CELERY_QUEUES=(
Queue(QUEUE_NAME, Exchange('manager.slow', type='direct'), Queue(QUEUE_NAME, Exchange('manager.slow', type='direct'),
......
...@@ -2,8 +2,8 @@ amqp==1.4.6 ...@@ -2,8 +2,8 @@ amqp==1.4.6
anyjson==0.3.3 anyjson==0.3.3
billiard==3.3.0.18 billiard==3.3.0.18
bpython==0.13.1 bpython==0.13.1
celery==3.1.16 celery==3.1.17
Django==1.7.1 Django==1.7.5
django-appconf==0.6 django-appconf==0.6
django-autocomplete-light==1.4.14 django-autocomplete-light==1.4.14
django-braces==1.4.0 django-braces==1.4.0
...@@ -14,7 +14,7 @@ django-sizefield==0.6 ...@@ -14,7 +14,7 @@ django-sizefield==0.6
django-sshkey==2.2.0 django-sshkey==2.2.0
django-statici18n==1.1 django-statici18n==1.1
django-tables2==0.15.0 django-tables2==0.15.0
django-taggit==0.12.2 git+https://git.ik.bme.hu/circle/django-taggit.git
docutils==0.12 docutils==0.12
Jinja2==2.7.3 Jinja2==2.7.3
jsonfield==1.0.0 jsonfield==1.0.0
...@@ -29,7 +29,7 @@ pylibmc==1.3.0 ...@@ -29,7 +29,7 @@ pylibmc==1.3.0
python-dateutil==2.2 python-dateutil==2.2
pyinotify==0.9.4 pyinotify==0.9.4
pytz==2014.7 pytz==2014.7
requests==2.4.3 requests==2.5.3
salt==2014.1.0 salt==2014.1.0
simplejson==3.6.5 simplejson==3.6.5
six==1.8.0 six==1.8.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment