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/DeliverProcessorService.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/DeliverProcessorService.ts')
| -rw-r--r-- | packages/backend/src/queue/processors/DeliverProcessorService.ts | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/packages/backend/src/queue/processors/DeliverProcessorService.ts b/packages/backend/src/queue/processors/DeliverProcessorService.ts index f293bd4d7e..406e9df850 100644 --- a/packages/backend/src/queue/processors/DeliverProcessorService.ts +++ b/packages/backend/src/queue/processors/DeliverProcessorService.ts @@ -1,4 +1,5 @@ import { Inject, Injectable } from '@nestjs/common'; +import * as Bull from 'bullmq'; import { DI } from '@/di-symbols.js'; import type { DriveFilesRepository, InstancesRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; @@ -16,7 +17,6 @@ import { StatusError } from '@/misc/status-error.js'; import { UtilityService } from '@/core/UtilityService.js'; import { bindThis } from '@/decorators.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; -import type Bull from 'bull'; import type { DeliverJobData } from '../types.js'; @Injectable() @@ -121,15 +121,13 @@ export class DeliverProcessorService { isSuspended: true, }); }); - return `${host} is gone`; + throw new Bull.UnrecoverableError(`${host} is gone`); } - // HTTPステータスコード4xxはクライアントエラーであり、それはつまり - // 何回再送しても成功することはないということなのでエラーにはしないでおく - return `${res.statusCode} ${res.statusMessage}`; + throw new Bull.UnrecoverableError(`${res.statusCode} ${res.statusMessage}`); } // 5xx etc. - throw `${res.statusCode} ${res.statusMessage}`; + throw new Error(`${res.statusCode} ${res.statusMessage}`); } else { // DNS error, socket error, timeout ... throw res; |