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

Merge pull request #1477 from GSA/revert-1475-main

Browse Source 
Revert previous hotfixes
This commit is contained in:
Carlo Costino
2024-12-12 09:43:00 -05:00
committed by GitHub
parent 6e4b684bf5 a15d81ea14
commit 560ef3f25b
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/celery/provider_tasks.py
View File

@@ -1,6 +1,5 @@
import json import json
import os import os
import random
from datetime import timedelta from datetime import timedelta
from botocore.exceptions import ClientError from botocore.exceptions import ClientError
@@ -30,7 +29,8 @@ DELIVERY_RECEIPT_DELAY_IN_SECONDS = 30
@notify_celery.task( @notify_celery.task(
bind=True, bind=True,
name="check_sms_delivery_receipt", name="check_sms_delivery_receipt",
max_retries=72, max_retries=48,
default_retry_delay=300,
) )
def check_sms_delivery_receipt(self, message_id, notification_id, sent_at): def check_sms_delivery_receipt(self, message_id, notification_id, sent_at):
""" """
@@ -62,10 +62,7 @@ def check_sms_delivery_receipt(self, message_id, notification_id, sent_at):
carrier=carrier, carrier=carrier,
provider_response=provider_response, provider_response=provider_response,
) )
base_delay = 3600 # one hour raise self.retry(exc=ntfe)
jitter = random.randint(-1200, +1200) # nosec B311
retry_delay = base_delay + jitter
raise self.retry(countdown=retry_delay, exc=ntfe)
except ClientError as err: except ClientError as err:
# Probably a ThrottlingException but could be something else # Probably a ThrottlingException but could be something else
error_code = err.response["Error"]["Code"] error_code = err.response["Error"]["Code"]
@@ -80,10 +77,7 @@ def check_sms_delivery_receipt(self, message_id, notification_id, sent_at):
carrier=carrier, carrier=carrier,
provider_response=provider_response, provider_response=provider_response,
) )
base_delay = 3600 # one hour raise self.retry(exc=err)
jitter = random.randint(-1200, +1200) # nosec B311
retry_delay = base_delay + jitter
raise self.retry(countdown=retry_delay, exc=err)
if status == "success": if status == "success":
status = NotificationStatus.DELIVERED status = NotificationStatus.DELIVERED

2
app/clients/cloudwatch/aws_cloudwatch.py
View File

@@ -158,7 +158,7 @@ class AwsCloudwatchClient(Client):
message["delivery"].get("phoneCarrier", "Unknown Carrier"), message["delivery"].get("phoneCarrier", "Unknown Carrier"),
) )
if time_now > (created_at + timedelta(hours=73)): if time_now > (created_at + timedelta(hours=3)):
# see app/models.py Notification. This message corresponds to "permanent-failure", # see app/models.py Notification. This message corresponds to "permanent-failure",
# but we are copy/pasting here to avoid circular imports. # but we are copy/pasting here to avoid circular imports.
return "failure", "Unable to find carrier response." return "failure", "Unable to find carrier response."

2
app/config.py
View File

@@ -167,7 +167,7 @@ class Config(object):
current_minute = (datetime.now().minute + 1) % 60 current_minute = (datetime.now().minute + 1) % 60
CELERY = { CELERY = {
"worker_max_tasks_per_child": 2000, "worker_max_tasks_per_child": 500,
"broker_url": REDIS_URL, "broker_url": REDIS_URL,
"broker_transport_options": { "broker_transport_options": {
"visibility_timeout": 310, "visibility_timeout": 310,