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 #1817 from alphagov/rc_add_virus_scan_error_task

Browse Source 
Logging refactor to make debugging Antivirus scans easier
This commit is contained in:
Richard Chapman
2018-04-03 14:17:15 +01:00
committed by GitHub
parent c392053847 f1abce22ae
commit 82274123f4
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/celery/letters_pdf_tasks.py
View File

@@ -21,6 +21,7 @@ from app.dao.notifications_dao import (
dao_get_notifications_by_references,
dao_update_notifications_by_reference,
)
from app.errors import VirusScanError
from app.letters.utils import (
get_reference_from_filename,
move_scanned_pdf_to_test_or_live_pdf_bucket,
@@ -162,9 +163,9 @@ def letter_in_created_state(filename):
@notify_celery.task(name='process-virus-scan-passed')
def process_virus_scan_passed(filename):
current_app.logger.info('Virus scan passed: {}'.format(filename))
reference = get_reference_from_filename(filename)
notification = dao_get_notification_by_reference(reference)
current_app.logger.info('notification id {} Virus scan passed: {}'.format(notification.id, filename))
is_test_key = notification.key_type == KEY_TYPE_TEST
move_scanned_pdf_to_test_or_live_pdf_bucket(
@@ -179,9 +180,9 @@ def process_virus_scan_passed(filename):
@notify_celery.task(name='process-virus-scan-failed')
def process_virus_scan_failed(filename):
current_app.logger.exception('Virus scan failed: {}'.format(filename))
move_failed_pdf(filename, ScanErrorType.FAILURE)
reference = get_reference_from_filename(filename)
notification = dao_get_notification_by_reference(reference)
updated_count = update_letter_pdf_status(reference, NOTIFICATION_VIRUS_SCAN_FAILED)
if updated_count != 1:
@@ -191,12 +192,14 @@ def process_virus_scan_failed(filename):
)
)
raise VirusScanError('notification id {} Virus scan failed: {}'.format(notification.id, filename))
@notify_celery.task(name='process-virus-scan-error')
def process_virus_scan_error(filename):
current_app.logger.exception('Virus scan error: {}'.format(filename))
move_failed_pdf(filename, ScanErrorType.ERROR)
reference = get_reference_from_filename(filename)
notification = dao_get_notification_by_reference(reference)
updated_count = update_letter_pdf_status(reference, NOTIFICATION_TECHNICAL_FAILURE)
if updated_count != 1:
@@ -206,6 +209,8 @@ def process_virus_scan_error(filename):
)
)
raise VirusScanError('notification id {} Virus scan error: {}'.format(notification.id, filename))
def update_letter_pdf_status(reference, status):
return dao_update_notifications_by_reference(

6
app/errors.py
View File

@@ -10,6 +10,12 @@ from jsonschema import ValidationError as JsonSchemaValidationError
from app.authentication.auth import AuthError
class VirusScanError(Exception):
def __init__(self, message):
super().__init__(message)
class InvalidRequest(Exception):
code = None
fields = []