From ce6b8b644cf9929c80e7a0f68bbb2e65c3db59ed Mon Sep 17 00:00:00 2001 From: avdata99 Date: Wed, 9 Oct 2024 14:04:36 -0300 Subject: [PATCH] Improve logs and release 0.6.1 --- clamav_service/jobs.py | 12 ++++++++++-- setup.py | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/clamav_service/jobs.py b/clamav_service/jobs.py index 5bc3211..3717d3e 100644 --- a/clamav_service/jobs.py +++ b/clamav_service/jobs.py @@ -156,7 +156,7 @@ def scan_resource(logger, ckan_url, api_key, resource_id): @job.asynchronous def scan(task_id, payload): logger = init_logger(task_id, payload) - logger.info(f"Starting job {task_id}") + logger.info(f"Starting ClamAV job {task_id}") validate_payload(payload) @@ -172,9 +172,17 @@ def scan(task_id, payload): "description": scan_result.stdout.decode("utf-8"), } if scan_result.returncode not in STATUSES: + logger.error( + f"Unknown return code {scan_result.returncode} (not in statuses) " + f"scanning resource {resource_id}" + ) raise util.JobError(json.dumps(response)) + response["status_text"] = STATUSES[scan_result.returncode] if scan_result.returncode == 2: + logger.error(f"Scan failed for resource {resource_id}: {response['description']}") raise util.JobError(json.dumps(response)) - logger.info(f"Completed scanning resource {resource_id}. Submitting result") + + final_status_text = response["status_text"] + logger.info(f"Completed scanning {final_status_text}. Resource {resource_id}. Submitting result") return response diff --git a/setup.py b/setup.py index 6227a57..8a13c6f 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ def _get_description(): setup( name="ckan-clamav-service", - version="0.6.0", + version="0.6.1", author="OKFN", license="AGPL-3.0", url="https://github.com/okfn/ckan-clamav-service",