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

Minor change to raising deskpro ticket and errors when letter acknowledgement fails.

Browse Source
This commit is contained in:
venusbb
2018-01-23 09:51:43 +00:00
parent 9629a69353
commit d93b0d12d1
2 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/celery/scheduled_tasks.py
View File

@@ -61,7 +61,7 @@ from app.celery.tasks import (
) )
from app.config import QueueNames, TaskNames from app.config import QueueNames, TaskNames
from app.utils import convert_utc_to_bst from app.utils import convert_utc_to_bst
from app.v2.errors import JobIncompleteError, NoAckFileReceived from app.v2.errors import JobIncompleteError
from app.dao.service_callback_api_dao import get_service_callback_api_for_service from app.dao.service_callback_api_dao import get_service_callback_api_for_service
from app.celery.service_callback_tasks import send_delivery_status_to_service from app.celery.service_callback_tasks import send_delivery_status_to_service
import pytz import pytz
@@ -533,17 +533,15 @@ def letter_raise_alert_if_no_ack_file_for_zip():
# strip empty element before comparison # strip empty element before comparison
ack_content_set.discard('') ack_content_set.discard('')
zip_file_set.discard('') zip_file_set.discard('')
if current_app.config['NOTIFY_ENVIRONMENT'] in ['production', 'test']:
if len(zip_file_set - ack_content_set) > 0: if len(zip_file_set - ack_content_set) > 0:
if current_app.config['NOTIFY_ENVIRONMENT'] in ['production', 'test']:
deskpro_client.create_ticket( deskpro_client.create_ticket(
subject="Letter acknowledge error", subject="Letter acknowledge error",
message=deskpro_message, message=deskpro_message,
ticket_type='alert' ticket_type='alert'
) )
current_app.logger.error(deskpro_message)
raise NoAckFileReceived(message=str(zip_file_set - ack_content_set))
else:
current_app.logger.info(deskpro_message)
if len(ack_content_set - zip_file_set) > 0: if len(ack_content_set - zip_file_set) > 0:
current_app.logger.info( current_app.logger.info(

17
app/v2/errors.py
View File

@@ -27,23 +27,6 @@ class JobIncompleteError(Exception):
} }
class NoAckFileReceived(Exception):
def __init__(self, message):
self.message = message
self.status_code = 500
def to_dict_v2(self):
return {
'status_code': self.status_code,
"errors": [
{
"error": 'NoAckFileReceived',
"message": str(self.message)
}
]
}
class TooManyRequestsError(InvalidRequest): class TooManyRequestsError(InvalidRequest):
status_code = 429 status_code = 429
message_template = 'Exceeded send limits ({}) for today' message_template = 'Exceeded send limits ({}) for today'