darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-23 07:46:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

add debug messages to show active services

Browse Source
This commit is contained in:
Kenneth Kehl
2025-06-03 07:27:14 -07:00
parent 7d9bb50b22
commit 84895e0064
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/aws/s3.py
View File

@@ -185,11 +185,9 @@ def cleanup_old_s3_objects():
break break
retained_services = [] retained_services = []
for service_id in service_ids: for service_id in service_ids:
# service = get_service_by_id(service_id)
retained_services.append(service_id) retained_services.append(service_id)
current_app.logger.info(
f"#delete-old-s3-objects Services with retained jobs: {retained_services}" return service_ids
)
except Exception: except Exception:
current_app.logger.exception( current_app.logger.exception(
"#delete-old-s3-objects An error occurred while cleaning up old s3 objects", "#delete-old-s3-objects An error occurred while cleaning up old s3 objects",

11
app/celery/tasks.py
View File

@@ -19,6 +19,7 @@ from app.dao.notifications_dao import (
from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_id from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_id
from app.dao.service_inbound_api_dao import get_service_inbound_api_for_service from app.dao.service_inbound_api_dao import get_service_inbound_api_for_service
from app.dao.service_sms_sender_dao import dao_get_service_sms_senders_by_id from app.dao.service_sms_sender_dao import dao_get_service_sms_senders_by_id
from app.dao.services_dao import dao_fetch_service_by_id
from app.dao.templates_dao import dao_get_template_by_id from app.dao.templates_dao import dao_get_template_by_id
from app.enums import JobStatus, KeyType, NotificationType from app.enums import JobStatus, KeyType, NotificationType
from app.errors import TotalRequestsError from app.errors import TotalRequestsError
@@ -496,7 +497,15 @@ def clean_job_cache():
@notify_celery.task(name="delete-old-s3-objects") @notify_celery.task(name="delete-old-s3-objects")
def delete_old_s3_objects(): def delete_old_s3_objects():
s3.cleanup_old_s3_objects()
existing_service_ids = s3.cleanup_old_s3_objects()
service_names = []
for service_id in existing_service_ids:
service = dao_fetch_service_by_id(service_id)
service_names.append(service.name)
current_app.logger.info(
f"#delete-old-s3-objects Services with retained jobs: {service_names}"
)
@notify_celery.task(name="process-incomplete-jobs") @notify_celery.task(name="process-incomplete-jobs")