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

Retry deliver_sms task immediately if sending fails

Browse Source 
If the `deliver_sms` catches an exception when trying to send an SMS, we
want the first retry to happen immediately (because we will have
switched providers), then every retry after that to happen at the
standard intervals.
This commit is contained in:
Katie Smith
2019-08-07 14:27:58 +01:00
parent eda0640869
commit e449e234db
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/celery/provider_tasks.py
View File

@@ -26,7 +26,10 @@ def deliver_sms(self, notification_id):
current_app.logger.exception( current_app.logger.exception(
"SMS notification delivery for id: {} failed".format(notification_id) "SMS notification delivery for id: {} failed".format(notification_id)
) )
self.retry(queue=QueueNames.RETRY) if self.request.retries == 0:
self.retry(queue=QueueNames.RETRY, countdown=0)
else:
self.retry(queue=QueueNames.RETRY)
except self.MaxRetriesExceededError: except self.MaxRetriesExceededError:
message = "RETRY FAILED: Max retries reached. The task send_sms_to_provider failed for notification {}. " \ message = "RETRY FAILED: Max retries reached. The task send_sms_to_provider failed for notification {}. " \
"Notification has been updated to technical-failure".format(notification_id) "Notification has been updated to technical-failure".format(notification_id)

4
tests/app/celery/test_provider_tasks.py
View File

@@ -34,7 +34,7 @@ def test_should_add_to_retry_queue_if_notification_not_found_in_deliver_sms_task
deliver_sms(notification_id) deliver_sms(notification_id)
app.delivery.send_to_providers.send_sms_to_provider.assert_not_called() app.delivery.send_to_providers.send_sms_to_provider.assert_not_called()
app.celery.provider_tasks.deliver_sms.retry.assert_called_with(queue="retry-tasks") app.celery.provider_tasks.deliver_sms.retry.assert_called_with(queue="retry-tasks", countdown=0)
def test_should_call_send_email_to_provider_from_deliver_email_task( def test_should_call_send_email_to_provider_from_deliver_email_task(
@@ -66,7 +66,7 @@ def test_should_go_into_technical_error_if_exceeds_retries_on_deliver_sms_task(s
with pytest.raises(NotificationTechnicalFailureException) as e: with pytest.raises(NotificationTechnicalFailureException) as e:
deliver_sms(sample_notification.id) deliver_sms(sample_notification.id)
provider_tasks.deliver_sms.retry.assert_called_with(queue="retry-tasks") provider_tasks.deliver_sms.retry.assert_called_with(queue="retry-tasks", countdown=0)
assert sample_notification.status == 'technical-failure' assert sample_notification.status == 'technical-failure'
assert str(sample_notification.id) in e.value.message assert str(sample_notification.id) in e.value.message