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

Merge pull request #2978 from alphagov/add-reference-to-msg

Browse Source 
Add reference to log message
This commit is contained in:
Rebecca Law
2020-09-28 12:04:59 +01:00
committed by GitHub
parent 1c4775c5db d7e53cdf50
commit e4e61b1e4b
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/celery/scheduled_tasks.py
View File

@@ -195,11 +195,11 @@ def check_precompiled_letter_state():
letters = dao_precompiled_letters_still_pending_virus_check() letters = dao_precompiled_letters_still_pending_virus_check()
if len(letters) > 0: if len(letters) > 0:
letter_ids = [str(letter.id) for letter in letters] letter_ids = [(str(letter.id), letter.reference) for letter in letters]
msg = """{} precompiled letters have been pending-virus-check for over 90 minutes. Follow runbook to resolve: msg = """{} precompiled letters have been pending-virus-check for over 90 minutes. Follow runbook to resolve:
https://github.com/alphagov/notifications-manuals/wiki/Support-Runbook#Deal-with-letter-pending-virus-scan-for-90-minutes. https://github.com/alphagov/notifications-manuals/wiki/Support-Runbook#Deal-with-letter-pending-virus-scan-for-90-minutes.
Notifications: {}""".format(len(letters), letter_ids) Notifications: {}""".format(len(letters), sorted(letter_ids))
current_app.logger.exception(msg) current_app.logger.exception(msg)

19
tests/app/celery/test_scheduled_tasks.py
View File

@@ -327,18 +327,23 @@ def test_check_precompiled_letter_state(mocker, sample_letter_template):
create_notification(template=sample_letter_template, create_notification(template=sample_letter_template,
status=NOTIFICATION_DELIVERED, status=NOTIFICATION_DELIVERED,
created_at=datetime.utcnow() - timedelta(seconds=6000)) created_at=datetime.utcnow() - timedelta(seconds=6000))
noti_1 = create_notification(template=sample_letter_template, notification_1 = create_notification(template=sample_letter_template,
status=NOTIFICATION_PENDING_VIRUS_CHECK, status=NOTIFICATION_PENDING_VIRUS_CHECK,
created_at=datetime.utcnow() - timedelta(seconds=5401)) created_at=datetime.utcnow() - timedelta(seconds=5401),
noti_2 = create_notification(template=sample_letter_template, reference='one')
status=NOTIFICATION_PENDING_VIRUS_CHECK, notification_2 = create_notification(template=sample_letter_template,
created_at=datetime.utcnow() - timedelta(seconds=70000)) status=NOTIFICATION_PENDING_VIRUS_CHECK,
created_at=datetime.utcnow() - timedelta(seconds=70000),
reference='two')
check_precompiled_letter_state() check_precompiled_letter_state()
id_references = sorted([(str(notification_1.id), notification_1.reference),
(str(notification_2.id), notification_2.reference)])
message = """2 precompiled letters have been pending-virus-check for over 90 minutes. Follow runbook to resolve: message = """2 precompiled letters have been pending-virus-check for over 90 minutes. Follow runbook to resolve:
https://github.com/alphagov/notifications-manuals/wiki/Support-Runbook#Deal-with-letter-pending-virus-scan-for-90-minutes. https://github.com/alphagov/notifications-manuals/wiki/Support-Runbook#Deal-with-letter-pending-virus-scan-for-90-minutes.
Notifications: ['{}', '{}']""".format(noti_2.id, noti_1.id) Notifications: {}""".format(id_references)
mock_logger.assert_called_once_with(message) mock_logger.assert_called_once_with(message)
mock_create_ticket.assert_called_with( mock_create_ticket.assert_called_with(