diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-05-29 11:54:49 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-29 11:54:49 +0900 |
| commit | fd7b77c542b51313d8b8ea60124725fe65a295d5 (patch) | |
| tree | 78893fdfe273496831124414789376b1e2a18997 /packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts | |
| parent | pnpm devでCtrl+Cで終了させてもプロセスが完全に殺せないの... (diff) | |
| download | sharkey-fd7b77c542b51313d8b8ea60124725fe65a295d5.tar.gz sharkey-fd7b77c542b51313d8b8ea60124725fe65a295d5.tar.bz2 sharkey-fd7b77c542b51313d8b8ea60124725fe65a295d5.zip | |
enhance(backend): migrate bull to bullmq (#10910)
* wip
* wip
* Update QueueService.ts
* wip
* refactor
* :v:
* fix
* Update QueueStatsService.ts
* refactor
* Update ApNoteService.ts
* Update mock-resolver.ts
* refactor
* Update mock-resolver.ts
Diffstat (limited to 'packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts')
| -rw-r--r-- | packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts b/packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts index 604497cf54..6772c5dc76 100644 --- a/packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts +++ b/packages/backend/src/queue/processors/DeleteDriveFilesProcessorService.ts @@ -5,10 +5,10 @@ import type { UsersRepository, DriveFilesRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; import type Logger from '@/logger.js'; import { DriveService } from '@/core/DriveService.js'; +import { bindThis } from '@/decorators.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; -import type Bull from 'bull'; +import type * as Bull from 'bullmq'; import type { DbJobDataWithUser } from '../types.js'; -import { bindThis } from '@/decorators.js'; @Injectable() export class DeleteDriveFilesProcessorService { @@ -31,12 +31,11 @@ export class DeleteDriveFilesProcessorService { } @bindThis - public async process(job: Bull.Job<DbJobDataWithUser>, done: () => void): Promise<void> { + public async process(job: Bull.Job<DbJobDataWithUser>): Promise<void> { this.logger.info(`Deleting drive files of ${job.data.user.id} ...`); const user = await this.usersRepository.findOneBy({ id: job.data.user.id }); if (user == null) { - done(); return; } @@ -56,7 +55,7 @@ export class DeleteDriveFilesProcessorService { }); if (files.length === 0) { - job.progress(100); + job.updateProgress(100); break; } @@ -71,10 +70,9 @@ export class DeleteDriveFilesProcessorService { userId: user.id, }); - job.progress(deletedCount / total); + job.updateProgress(deletedCount / total); } this.logger.succ(`All drive files (${deletedCount}) of ${user.id} has been deleted.`); - done(); } } |