Merge branch 'master' into seperate-queues-for-sending-and-for-db

This commit is contained in:
Martyn Inglis
2016-08-30 14:25:14 +01:00
31 changed files with 490 additions and 844 deletions

View File

@@ -50,6 +50,11 @@ class Config(object):
CELERY_TASK_SERIALIZER = 'json'
CELERY_IMPORTS = ('app.celery.tasks', 'app.celery.scheduled_tasks')
CELERYBEAT_SCHEDULE = {
'run-scheduled-jobs': {
'task': 'run-scheduled-jobs',
'schedule': crontab(),
'options': {'queue': 'periodic'}
},
'delete-verify-codes': {
'task': 'delete-verify-codes',
'schedule': timedelta(minutes=63),