mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-01 23:55:58 -05:00
Add reporting worker
also remove references to unused statistics queue
This commit is contained in:
@@ -20,7 +20,7 @@ class QueueNames(object):
|
|||||||
SEND_SMS = 'send-sms-tasks'
|
SEND_SMS = 'send-sms-tasks'
|
||||||
SEND_EMAIL = 'send-email-tasks'
|
SEND_EMAIL = 'send-email-tasks'
|
||||||
RESEARCH_MODE = 'research-mode-tasks'
|
RESEARCH_MODE = 'research-mode-tasks'
|
||||||
STATISTICS = 'statistics-tasks'
|
REPORTING = 'reporting-tasks'
|
||||||
JOBS = 'job-tasks'
|
JOBS = 'job-tasks'
|
||||||
RETRY = 'retry-tasks'
|
RETRY = 'retry-tasks'
|
||||||
NOTIFY = 'notify-internal-tasks'
|
NOTIFY = 'notify-internal-tasks'
|
||||||
@@ -39,7 +39,7 @@ class QueueNames(object):
|
|||||||
QueueNames.SEND_SMS,
|
QueueNames.SEND_SMS,
|
||||||
QueueNames.SEND_EMAIL,
|
QueueNames.SEND_EMAIL,
|
||||||
QueueNames.RESEARCH_MODE,
|
QueueNames.RESEARCH_MODE,
|
||||||
QueueNames.STATISTICS,
|
QueueNames.REPORTING,
|
||||||
QueueNames.JOBS,
|
QueueNames.JOBS,
|
||||||
QueueNames.RETRY,
|
QueueNames.RETRY,
|
||||||
QueueNames.NOTIFY,
|
QueueNames.NOTIFY,
|
||||||
@@ -215,12 +215,12 @@ class Config(object):
|
|||||||
'create-nightly-billing': {
|
'create-nightly-billing': {
|
||||||
'task': 'create-nightly-billing',
|
'task': 'create-nightly-billing',
|
||||||
'schedule': crontab(hour=0, minute=15),
|
'schedule': crontab(hour=0, minute=15),
|
||||||
'options': {'queue': QueueNames.PERIODIC}
|
'options': {'queue': QueueNames.REPORTING}
|
||||||
},
|
},
|
||||||
'create-nightly-notification-status': {
|
'create-nightly-notification-status': {
|
||||||
'task': 'create-nightly-notification-status',
|
'task': 'create-nightly-notification-status',
|
||||||
'schedule': crontab(hour=0, minute=30), # after 'timeout-sending-notifications'
|
'schedule': crontab(hour=0, minute=30), # after 'timeout-sending-notifications'
|
||||||
'options': {'queue': QueueNames.PERIODIC}
|
'options': {'queue': QueueNames.REPORTING}
|
||||||
},
|
},
|
||||||
'delete-sms-notifications': {
|
'delete-sms-notifications': {
|
||||||
'task': 'delete-sms-notifications',
|
'task': 'delete-sms-notifications',
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
'notify-delivery-worker-research': {},
|
'notify-delivery-worker-research': {},
|
||||||
'notify-delivery-worker-sender': {'disk_quota': '2G', 'memory': '3G'},
|
'notify-delivery-worker-sender': {'disk_quota': '2G', 'memory': '3G'},
|
||||||
'notify-delivery-worker-periodic': {},
|
'notify-delivery-worker-periodic': {},
|
||||||
|
'notify-delivery-worker-reporting': {},
|
||||||
'notify-delivery-worker-priority': {},
|
'notify-delivery-worker-priority': {},
|
||||||
'notify-delivery-worker-letters': {},
|
'notify-delivery-worker-letters': {},
|
||||||
'notify-delivery-worker-retry-tasks': {},
|
'notify-delivery-worker-retry-tasks': {},
|
||||||
|
|||||||
@@ -26,7 +26,11 @@ case $NOTIFY_APP_NAME in
|
|||||||
;;
|
;;
|
||||||
delivery-worker-periodic)
|
delivery-worker-periodic)
|
||||||
scripts/run_app_paas.sh celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=2 \
|
scripts/run_app_paas.sh celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=2 \
|
||||||
-Q periodic-tasks,statistics-tasks 2> /dev/null
|
-Q periodic-tasks 2> /dev/null
|
||||||
|
;;
|
||||||
|
delivery-worker-reporting)
|
||||||
|
scripts/run_app_paas.sh celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=11 \
|
||||||
|
-Q reporting-tasks 2> /dev/null
|
||||||
;;
|
;;
|
||||||
delivery-worker-priority)
|
delivery-worker-priority)
|
||||||
scripts/run_app_paas.sh celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=5 \
|
scripts/run_app_paas.sh celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=5 \
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ def test_queue_names_all_queues_correct():
|
|||||||
QueueNames.SEND_SMS,
|
QueueNames.SEND_SMS,
|
||||||
QueueNames.SEND_EMAIL,
|
QueueNames.SEND_EMAIL,
|
||||||
QueueNames.RESEARCH_MODE,
|
QueueNames.RESEARCH_MODE,
|
||||||
QueueNames.STATISTICS,
|
QueueNames.REPORTING,
|
||||||
QueueNames.JOBS,
|
QueueNames.JOBS,
|
||||||
QueueNames.RETRY,
|
QueueNames.RETRY,
|
||||||
QueueNames.NOTIFY,
|
QueueNames.NOTIFY,
|
||||||
|
|||||||
Reference in New Issue
Block a user