fix: Respect abort signal in admin maintenance jobs

3 files changed, 11 insertions, 1 deletions

diff --git a/apps/workers/workers/adminMaintenance/tasks/migrateLinkHtmlContent.ts b/apps/workers/workers/adminMaintenance/tasks/migrateLinkHtmlContent.ts
index 467f2aa7..a9ae54a6 100644
--- a/apps/workers/workers/adminMaintenance/tasks/migrateLinkHtmlContent.ts
+++ b/apps/workers/workers/adminMaintenance/tasks/migrateLinkHtmlContent.ts
@@ -157,6 +157,12 @@ export async function runMigrateLargeLinkHtmlTask(
   let cursor: string | undefined;
 
   while (true) {
+    if (job.abortSignal.aborted) {
+      logger.warn(
+        `[adminMaintenance:migrate_large_link_html][${jobId}] Aborted`,
+      );
+      break;
+    }
     const bookmarksToMigrate = await getBookmarksWithLargeInlineHtml(
       BATCH_SIZE,
       cursor,
diff --git a/apps/workers/workers/adminMaintenance/tasks/tidyAssets.ts b/apps/workers/workers/adminMaintenance/tasks/tidyAssets.ts
index 8732c7c4..792f9417 100644
--- a/apps/workers/workers/adminMaintenance/tasks/tidyAssets.ts
+++ b/apps/workers/workers/adminMaintenance/tasks/tidyAssets.ts
@@ -67,6 +67,10 @@ export async function runTidyAssetsTask(
   }
 
   for await (const asset of getAllAssets()) {
+    if (job.abortSignal.aborted) {
+      logger.warn(`[adminMaintenance:tidy_assets][${jobId}] Aborted`);
+      break;
+    }
     try {
       await handleAsset(asset, parseResult.data, jobId);
     } catch (error) {
diff --git a/apps/workers/workers/adminMaintenanceWorker.ts b/apps/workers/workers/adminMaintenanceWorker.ts
index af6aed22..03c3b964 100644
--- a/apps/workers/workers/adminMaintenanceWorker.ts
+++ b/apps/workers/workers/adminMaintenanceWorker.ts
@@ -43,7 +43,7 @@ export class AdminMaintenanceWorker {
         {
           concurrency: 1,
           pollIntervalMs: 1000,
-          timeoutSecs: 30,
+          timeoutSecs: 600,
         },
       );