darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-04 10:21:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Broke the periodic queue out from the standard worker.

Browse Source 
- now has own worker with worker count of 2
- this is too ensure that any issues with scheduled jobs do not affect core applications
This commit is contained in:
Martyn Inglis
2017-04-04 11:23:54 +01:00
parent 0ac3bfcb81
commit 787d0da7db
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/config.py
View File

@@ -119,17 +119,17 @@ class Config(object):
}, },
'delete-failed-notifications': { 'delete-failed-notifications': {
'task': 'delete-failed-notifications', 'task': 'delete-failed-notifications',
'schedule': crontab(minute=15, hour='0,1,2'), 'schedule': crontab(minute=0, hour=0),
'options': {'queue': 'periodic'} 'options': {'queue': 'periodic'}
}, },
'delete-successful-notifications': { 'delete-successful-notifications': {
'task': 'delete-successful-notifications', 'task': 'delete-successful-notifications',
'schedule': crontab(minute=0, hour='0,1,2'), 'schedule': crontab(minute=0, hour=1),
'options': {'queue': 'periodic'} 'options': {'queue': 'periodic'}
}, },
'send-daily-performance-platform-stats': { 'send-daily-performance-platform-stats': {
'task': 'send-daily-performance-platform-stats', 'task': 'send-daily-performance-platform-stats',
'schedule': crontab(minute=0, hour=4), # 04:00 'schedule': crontab(minute=0, hour=2),
'options': {'queue': 'periodic'} 'options': {'queue': 'periodic'}
}, },
'switch-current-sms-provider-on-slow-delivery': { 'switch-current-sms-provider-on-slow-delivery': {
@@ -139,17 +139,16 @@ class Config(object):
}, },
'timeout-sending-notifications': { 'timeout-sending-notifications': {
'task': 'timeout-sending-notifications', 'task': 'timeout-sending-notifications',
'schedule': crontab(minute=30, hour='0,1,2'), 'schedule': crontab(minute=0, hour=3),
'options': {'queue': 'periodic'} 'options': {'queue': 'periodic'}
}, },
'remove_csv_files': { 'remove_csv_files': {
'task': 'remove_csv_files', 'task': 'remove_csv_files',
'schedule': crontab(minute=45, hour='0,1,2'), 'schedule': crontab(minute=0, hour=4),
'options': {'queue': 'periodic'} 'options': {'queue': 'periodic'}
} }
} }
CELERY_QUEUES = [ CELERY_QUEUES = [
Queue('periodic', Exchange('default'), routing_key='periodic'),
Queue('process-job', Exchange('default'), routing_key='process-job'), Queue('process-job', Exchange('default'), routing_key='process-job'),
Queue('retry', Exchange('default'), routing_key='retry'), Queue('retry', Exchange('default'), routing_key='retry'),
Queue('notify', Exchange('default'), routing_key='notify') Queue('notify', Exchange('default'), routing_key='notify')
@@ -191,6 +190,7 @@ class Development(Config):
SQLALCHEMY_ECHO = False SQLALCHEMY_ECHO = False
CELERY_QUEUES = Config.CELERY_QUEUES + [ CELERY_QUEUES = Config.CELERY_QUEUES + [
Queue('db-sms', Exchange('default'), routing_key='db-sms'), Queue('db-sms', Exchange('default'), routing_key='db-sms'),
Queue('periodic', Exchange('default'), routing_key='periodic'),
Queue('db-email', Exchange('default'), routing_key='db-email'), Queue('db-email', Exchange('default'), routing_key='db-email'),
Queue('db-letter', Exchange('default'), routing_key='db-letter'), Queue('db-letter', Exchange('default'), routing_key='db-letter'),
Queue('send-sms', Exchange('default'), routing_key='send-sms'), Queue('send-sms', Exchange('default'), routing_key='send-sms'),
@@ -210,6 +210,7 @@ class Test(Config):
STATSD_HOST = "localhost" STATSD_HOST = "localhost"
STATSD_PORT = 1000 STATSD_PORT = 1000
CELERY_QUEUES = Config.CELERY_QUEUES + [ CELERY_QUEUES = Config.CELERY_QUEUES + [
Queue('periodic', Exchange('default'), routing_key='periodic'),
Queue('db-sms', Exchange('default'), routing_key='db-sms'), Queue('db-sms', Exchange('default'), routing_key='db-sms'),
Queue('db-email', Exchange('default'), routing_key='db-email'), Queue('db-email', Exchange('default'), routing_key='db-email'),
Queue('db-letter', Exchange('default'), routing_key='db-letter'), Queue('db-letter', Exchange('default'), routing_key='db-letter'),

5
manifest-delivery-base.yml
View File

@@ -35,6 +35,11 @@ applications:
env: env:
NOTIFY_APP_NAME: delivery-worker-sender NOTIFY_APP_NAME: delivery-worker-sender
- name: notify-delivery-worker-periodic
command: scripts/run_app_paas.sh celery -A aws_run_celery.notify_celery worker --loglevel=INFO --concurrency=2 -Q periodic
env:
NOTIFY_APP_NAME: delivery-worker
- name: notify-delivery-worker - name: notify-delivery-worker
command: scripts/run_app_paas.sh celery -A aws_run_celery.notify_celery worker --loglevel=INFO --concurrency=11 command: scripts/run_app_paas.sh celery -A aws_run_celery.notify_celery worker --loglevel=INFO --concurrency=11
env: env: