darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-08 02:58:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Latest and greatest.

Browse Source 
Signed-off-by: Cliff Hill <Clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-12-10 12:18:37 -05:00
parent 8edc8b04a7
commit d54968e707
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/celery/process_ses_receipts_tasks.py
View File

@@ -27,8 +27,8 @@ from app.utils import utc_now
@notify_celery.task( @notify_celery.task(
bind=True, bind=True,
name="process-ses-result", name="process-ses-result",
throws=(Exception,),
autoretry_for=(Exception,), autoretry_for=(Exception,),
# throws=(Exception,), # Been attempted, did nothing.
max_retries=5, max_retries=5,
default_retry_delay=300, default_retry_delay=300,
) )
@@ -59,11 +59,9 @@ def process_ses_results(self, response):
reference reference
) )
except NoResultFound: except NoResultFound:
print("&"*80)
message_time = iso8601.parse_date(ses_message["mail"]["timestamp"]).replace( message_time = iso8601.parse_date(ses_message["mail"]["timestamp"]).replace(
tzinfo=None tzinfo=None
) )
print("&"*80)
if utc_now() - message_time < timedelta(minutes=5): if utc_now() - message_time < timedelta(minutes=5):
current_app.logger.info( current_app.logger.info(
f"Notification not found for reference: {reference}" f"Notification not found for reference: {reference}"
@@ -71,7 +69,6 @@ def process_ses_results(self, response):
f"Callback may have arrived before notification was" f"Callback may have arrived before notification was"
f"persisted to the DB. Adding task to retry queue" f"persisted to the DB. Adding task to retry queue"
) )
print("&"*80)
raise raise
else: else:
current_app.logger.warning( current_app.logger.warning(
@@ -102,15 +99,13 @@ def process_ses_results(self, response):
if not aws_response_dict["success"]: if not aws_response_dict["success"]:
current_app.logger.info( current_app.logger.info(
"SES delivery failed: notification id {} and reference {} has error found. Status {}".format( f"SES delivery failed: notification id {notification.id} and reference "
notification.id, reference, aws_response_dict["message"] f"{reference} has error found. Status {aws_response_dict['message']}"
)
) )
else: else:
current_app.logger.info( current_app.logger.info(
"SES callback return status of {} for notification: {}".format( f"SES callback return status of {notification_status} "
notification_status, notification.id f"for notification: {notification.id}"
)
) )
check_and_queue_callback_task(notification) check_and_queue_callback_task(notification)
@@ -118,10 +113,9 @@ def process_ses_results(self, response):
return True return True
except Exception as e: except Exception as e:
print("^"*80) print("Exception REACHED")
print(type(e)) print(type(e))
print(e) print(e)
print("^"*80)
current_app.logger.exception("Error processing SES results") current_app.logger.exception("Error processing SES results")
raise raise

11
tests/app/celery/test_process_ses_receipts_tasks.py
View File

@@ -245,11 +245,11 @@ def test_ses_callback_should_not_update_notification_status_if_already_delivered
def test_ses_callback_should_retry_if_notification_is_new(client, _notify_db, mocker): def test_ses_callback_should_retry_if_notification_is_new(client, _notify_db, mocker):
mock_retry = mocker.patch( # mock_retry = mocker.patch(
"app.celery.process_ses_receipts_tasks.process_ses_results.retry" # "app.celery.process_ses_receipts_tasks.process_ses_results.retry"
) # )
mock_logger = mocker.patch( mock_logger = mocker.patch(
"app.celery.process_ses_receipts_tasks.current_app.logger.error" "app.celery.process_ses_receipts_tasks.current_app.logger.exception"
) )
with freeze_time("2017-11-17T12:14:03.646Z"): with freeze_time("2017-11-17T12:14:03.646Z"):
try: try:
@@ -264,8 +264,9 @@ def test_ses_callback_should_retry_if_notification_is_new(client, _notify_db, mo
print("-" * 80) print("-" * 80)
print(traceback.format_exc()) print(traceback.format_exc())
print("-" * 80) print("-" * 80)
raise
assert mock_logger.call_count == 0 assert mock_logger.call_count == 0
assert mock_retry.call_count == 1 # assert mock_retry.call_count == 1
def test_ses_callback_should_log_if_notification_is_missing(client, _notify_db, mocker): def test_ses_callback_should_log_if_notification_is_missing(client, _notify_db, mocker):