Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gutyán Gábor
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
cfa1e837
authored
Mar 03, 2015
by
Bach Dániel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-fix-celery' into 'master'
Feature fix celery
✅
See merge request !299
parents
871a5a23
31e4886b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
13 deletions
+7
-13
circle/manager/mancelery.py
+1
-3
circle/manager/moncelery.py
+1
-3
circle/manager/slowcelery.py
+1
-3
requirements/base.txt
+4
-4
No files found.
circle/manager/mancelery.py
View file @
cfa1e837
...
...
@@ -22,7 +22,6 @@ from kombu import Queue, Exchange
from
os
import
getenv
HOSTNAME
=
"localhost"
CACHE_URI
=
getenv
(
"CACHE_URI"
,
"pylibmc://127.0.0.1:11211/"
)
QUEUE_NAME
=
HOSTNAME
+
'.man'
...
...
@@ -38,8 +37,7 @@ celery = Celery('manager',
])
celery
.
conf
.
update
(
CELERY_RESULT_BACKEND
=
'cache'
,
CELERY_CACHE_BACKEND
=
CACHE_URI
,
CELERY_RESULT_BACKEND
=
'amqp'
,
CELERY_TASK_RESULT_EXPIRES
=
300
,
CELERY_QUEUES
=
(
Queue
(
HOSTNAME
+
'.man'
,
Exchange
(
'manager'
,
type
=
'direct'
),
...
...
circle/manager/moncelery.py
View file @
cfa1e837
...
...
@@ -22,7 +22,6 @@ from kombu import Queue, Exchange
from
os
import
getenv
HOSTNAME
=
"localhost"
CACHE_URI
=
getenv
(
"CACHE_URI"
,
"pylibmc://127.0.0.1:11211/"
)
QUEUE_NAME
=
HOSTNAME
+
'.monitor'
celery
=
Celery
(
'monitor'
,
...
...
@@ -32,8 +31,7 @@ celery = Celery('monitor',
])
celery
.
conf
.
update
(
CELERY_RESULT_BACKEND
=
'cache'
,
CELERY_CACHE_BACKEND
=
CACHE_URI
,
CELERY_RESULT_BACKEND
=
'amqp'
,
CELERY_TASK_RESULT_EXPIRES
=
300
,
CELERY_QUEUES
=
(
Queue
(
QUEUE_NAME
,
Exchange
(
'monitor'
,
type
=
'direct'
),
...
...
circle/manager/slowcelery.py
View file @
cfa1e837
...
...
@@ -22,7 +22,6 @@ from kombu import Queue, Exchange
from
os
import
getenv
HOSTNAME
=
"localhost"
CACHE_URI
=
getenv
(
"CACHE_URI"
,
"pylibmc://127.0.0.1:11211/"
)
QUEUE_NAME
=
HOSTNAME
+
'.man.slow'
celery
=
Celery
(
'manager.slow'
,
...
...
@@ -34,8 +33,7 @@ celery = Celery('manager.slow',
])
celery
.
conf
.
update
(
CELERY_RESULT_BACKEND
=
'cache'
,
CELERY_CACHE_BACKEND
=
CACHE_URI
,
CELERY_RESULT_BACKEND
=
'amqp'
,
CELERY_TASK_RESULT_EXPIRES
=
300
,
CELERY_QUEUES
=
(
Queue
(
QUEUE_NAME
,
Exchange
(
'manager.slow'
,
type
=
'direct'
),
...
...
requirements/base.txt
View file @
cfa1e837
...
...
@@ -2,8 +2,8 @@ amqp==1.4.6
anyjson==0.3.3
billiard==3.3.0.18
bpython==0.13.1
celery==3.1.1
6
Django==1.7.
1
celery==3.1.1
7
Django==1.7.
5
django-appconf==0.6
django-autocomplete-light==1.4.14
django-braces==1.4.0
...
...
@@ -14,7 +14,7 @@ django-sizefield==0.6
django-sshkey==2.2.0
django-statici18n==1.1
django-tables2==0.15.0
django-taggit==0.12.2
git+https://git.ik.bme.hu/circle/django-taggit.git
docutils==0.12
Jinja2==2.7.3
jsonfield==1.0.0
...
...
@@ -29,7 +29,7 @@ pylibmc==1.3.0
python-dateutil==2.2
pyinotify==0.9.4
pytz==2014.7
requests==2.
4
.3
requests==2.
5
.3
salt==2014.1.0
simplejson==3.6.5
six==1.8.0
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment