Skip to content

Commit

Permalink
updated requirements, conf and supervisord
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexis Durand committed Dec 10, 2016
1 parent 28a328f commit 16d42e9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
6 changes: 4 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
celery<4.0
celery
coveralls
cryptography
django<1.10
django-celery
django-celery-results
django-celery-beat
django-dbbackup
factory-boy
flower
gunicorn
pyasn1
pyopenssl
Expand Down
7 changes: 4 additions & 3 deletions settings/django.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

# Hosts/domain names that are valid for this site; required if DEBUG is False
# See https://docs.djangoproject.com/en/1.4/ref/settings/#allowed-hosts
ALLOWED_HOSTS = []
ALLOWED_HOSTS = ['localhost', '127.0.0.1']

# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
Expand Down Expand Up @@ -145,7 +145,6 @@
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.admin',
'djcelery',
'dbbackup',
'middleware',
'mii_interface',
Expand All @@ -154,6 +153,8 @@
'mii_sorter',
'mii_rating',
'mii_indexer',
'django_celery_results',
'django_celery_beat',
# 'debug_toolbar',
# 'devserver',
)
Expand Down Expand Up @@ -193,7 +194,7 @@
'mii_indexer.tasks',
)

CELERY_BEAT_SCHEDULER = 'djcelery.schedulers.DatabaseScheduler'
CELERY_RESULT_BACKEND = 'django-db'

CELERY_TASK_SERIALIZER = 'json'
CELERY_ACCEPT_CONTENT = ['json'] # Ignore other content
Expand Down
6 changes: 3 additions & 3 deletions supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ stdout_logfile=syslog
stderr_logfile=syslog

[program:celerybeat]
command=celery -A mii_celery beat -l info
command=celery -A mii_celery beat -l info -S django
directory=/app
numprocs=1
stdout_logfile=syslog
Expand All @@ -29,8 +29,8 @@ autostart=true
autorestart=true
startsecs=10

[program:celerycam]
command=python manage.py celerycam -l info
[program:flower]
command=celery -A mii_celery flower
directory=/app
numprocs=1
stdout_logfile=syslog
Expand Down

0 comments on commit 16d42e9

Please sign in to comment.