From 86fbe5cc24c04cb22614049997140a4f4d9ee9b7 Mon Sep 17 00:00:00 2001
From: Carlos Monastyrski <charly.monastyrski@gmail.com>
Date: Mon, 11 Aug 2025 12:06:35 -0700
Subject: [PATCH] Improve dailyResourceCleanUpQueue error message

---
 .../resource-cleanup-queue.ts                 | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/backend/src/services/resource-cleanup/resource-cleanup-queue.ts b/backend/src/services/resource-cleanup/resource-cleanup-queue.ts
index 42a5b3eff..773bbe379 100644
--- a/backend/src/services/resource-cleanup/resource-cleanup-queue.ts
+++ b/backend/src/services/resource-cleanup/resource-cleanup-queue.ts
@@ -52,19 +52,24 @@ export const dailyResourceCleanUpQueueServiceFactory = ({
     await queueService.startPg<QueueName.DailyResourceCleanUp>(
       QueueJobs.DailyResourceCleanUp,
       async () => {
-        logger.info(`${QueueName.DailyResourceCleanUp}: queue task started`);
-        await identityAccessTokenDAL.removeExpiredTokens();
-        await identityUniversalAuthClientSecretDAL.removeExpiredClientSecrets();
-        await secretSharingDAL.pruneExpiredSharedSecrets();
-        await secretSharingDAL.pruneExpiredSecretRequests();
-        await snapshotDAL.pruneExcessSnapshots();
-        await secretVersionDAL.pruneExcessVersions();
-        await secretVersionV2DAL.pruneExcessVersions();
-        await secretFolderVersionDAL.pruneExcessVersions();
-        await serviceTokenService.notifyExpiringTokens();
-        await orgService.notifyInvitedUsers();
-        await auditLogDAL.pruneAuditLog();
-        logger.info(`${QueueName.DailyResourceCleanUp}: queue task completed`);
+        try {
+          logger.info(`${QueueName.DailyResourceCleanUp}: queue task started`);
+          await identityAccessTokenDAL.removeExpiredTokens();
+          await identityUniversalAuthClientSecretDAL.removeExpiredClientSecrets();
+          await secretSharingDAL.pruneExpiredSharedSecrets();
+          await secretSharingDAL.pruneExpiredSecretRequests();
+          await snapshotDAL.pruneExcessSnapshots();
+          await secretVersionDAL.pruneExcessVersions();
+          await secretVersionV2DAL.pruneExcessVersions();
+          await secretFolderVersionDAL.pruneExcessVersions();
+          await serviceTokenService.notifyExpiringTokens();
+          await orgService.notifyInvitedUsers();
+          await auditLogDAL.pruneAuditLog();
+          logger.info(`${QueueName.DailyResourceCleanUp}: queue task completed`);
+        } catch (error) {
+          logger.error(error, `${QueueName.DailyResourceCleanUp}: resource cleanup failed`);
+          throw error;
+        }
       },
       {
         batchSize: 1,
@@ -78,6 +83,10 @@ export const dailyResourceCleanUpQueueServiceFactory = ({
       undefined,
       { tz: "UTC" }
     );
+
+    queueService.listen(QueueName.DailyResourceCleanUp, "failed", (_, err) => {
+      logger.error(err, `${QueueName.DailyResourceCleanUp}: resource cleanup failed`);
+    });
   };
 
   return {