Просмотр исходного кода

Merge branch 'feat/78039-151411-cancel-streams-on-export-job-abort' into feat/147526-151412-reuse-upload-on-duplicate-request

Futa Arai 1 год назад
Родитель
Сommit
9b096ff2a1

+ 0 - 1
apps/app/src/features/page-bulk-export/server/service/page-bulk-export-job-cron.ts

@@ -39,7 +39,6 @@ class PageBulkExportJobCronService extends CronService {
       createdAt: { $lt: new Date(Date.now() - exportJobExpirationSeconds * 1000) },
     });
     for (const expiredExportJob of expiredExportJobs) {
-      pageBulkExportService?.pageBulkExportJobStreamManager?.destroyJobStream(expiredExportJob._id);
       // eslint-disable-next-line no-await-in-loop
       await this.cleanUpAndDeleteBulkExportJob(expiredExportJob);
     }

+ 1 - 1
apps/app/src/features/page-bulk-export/server/service/page-bulk-export/index.ts

@@ -409,7 +409,7 @@ class PageBulkExportService {
    * - abort multipart upload
    */
   async cleanUpExportJobResources(pageBulkExportJob: PageBulkExportJobDocument) {
-    this.pageBulkExportJobStreamManager.removeJobStream(pageBulkExportJob._id);
+    this.pageBulkExportJobStreamManager?.destroyJobStream(pageBulkExportJob._id);
 
     const promises = [
       PageBulkExportPageSnapshot.deleteMany({ pageBulkExportJob }),