darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-20 18:13:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Configuring the autoretry stuff.

Browse Source 
Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-11-22 16:30:38 -05:00
parent 93be79c2d5
commit 5aa16bf4cc
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/celery/service_callback_tasks.py
View File

@@ -53,7 +53,11 @@ def _send_to_service_task_handler(func):
@_send_to_service_task_handler
@notify_celery.task(
bind=True, name="send-delivery-status", max_retries=5, default_retry_delay=300
bind=True,
name="send-delivery-status",
max_retries=5,
default_retry_delay=300,
autoretry_for=HTTPError,
)
def send_delivery_status_to_service(self, notification_id, encrypted_status_update):
status_update = encryption.decrypt(encrypted_status_update)
@@ -82,7 +86,11 @@ def send_delivery_status_to_service(self, notification_id, encrypted_status_upda
@_send_to_service_task_handler
@notify_celery.task(
bind=True, name="send-complaint", max_retries=5, default_retry_delay=300
bind=True,
name="send-complaint",
max_retries=5,
default_retry_delay=300,
autoretry_for=HTTPError,
)
def send_complaint_to_service(self, complaint_data):
complaint = encryption.decrypt(complaint_data)

26
app/celery/tasks.py
View File

@@ -12,7 +12,10 @@ from app.celery import provider_tasks
from app.config import QueueNames
from app.dao.inbound_sms_dao import dao_get_inbound_sms_by_id
from app.dao.jobs_dao import dao_get_job_by_id, dao_update_job
from app.dao.notifications_dao import dao_get_last_notification_added_for_job_id, get_notification_by_id
from app.dao.notifications_dao import (
dao_get_last_notification_added_for_job_id,
get_notification_by_id,
)
from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_id
from app.dao.service_inbound_api_dao import get_service_inbound_api_for_service
from app.dao.service_sms_sender_dao import dao_get_service_sms_senders_by_id
@@ -190,7 +193,13 @@ def _save_task_hander(func):
@_save_task_hander
@notify_celery.task(bind=True, name="save-sms", max_retries=5, default_retry_delay=300)
@notify_celery.task(
bind=True,
name="save-sms",
max_retries=5,
default_retry_delay=300,
autoretry_for=SQLAlchemyError,
)
def save_sms(self, service_id, notification_id, encrypted_notification, sender_id=None):
"""Persist notification to db and place notification in queue to send to sns."""
notification = encryption.decrypt(encrypted_notification)
@@ -218,9 +227,7 @@ def save_sms(self, service_id, notification_id, encrypted_notification, sender_i
f"service not allowed to send for job_id {notification.get('job', None)}, aborting"
)
)
current_app.logger.debug(
f"SMS {notification_id} failed as restricted service"
)
current_app.logger.debug(f"SMS {notification_id} failed as restricted service")
return
try:
@@ -259,7 +266,8 @@ def save_sms(self, service_id, notification_id, encrypted_notification, sender_i
)
current_app.logger.debug(
f"SMS {saved_notification.id} created at {saved_notification.created_at} for job {notification.get('job', None)}"
f"SMS {saved_notification.id} created at {saved_notification.created_at} for job "
f"{notification.get('job', None)}"
)
except SQLAlchemyError:
@@ -274,7 +282,11 @@ def save_sms(self, service_id, notification_id, encrypted_notification, sender_i
@_save_task_hander
@notify_celery.task(
bind=True, name="save-email", max_retries=5, default_retry_delay=300
bind=True,
name="save-email",
max_retries=5,
default_retry_delay=300,
autoretry_for=SQLAlchemyError,
)
def save_email(
self, service_id, notification_id, encrypted_notification, sender_id=None