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/WebhookDeliverProcessorService.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/WebhookDeliverProcessorService.ts')
| -rw-r--r-- | packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts index 84a5c21c49..8b40c16749 100644 --- a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts +++ b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts @@ -1,4 +1,5 @@ import { Inject, Injectable } from '@nestjs/common'; +import * as Bull from 'bullmq'; import { DI } from '@/di-symbols.js'; import type { WebhooksRepository } from '@/models/index.js'; import type { Config } from '@/config.js'; @@ -7,7 +8,6 @@ import { HttpRequestService } from '@/core/HttpRequestService.js'; import { StatusError } from '@/misc/status-error.js'; import { bindThis } from '@/decorators.js'; import { QueueLoggerService } from '../QueueLoggerService.js'; -import type Bull from 'bull'; import type { WebhookDeliverJobData } from '../types.js'; @Injectable() @@ -66,11 +66,11 @@ export class WebhookDeliverProcessorService { if (res instanceof StatusError) { // 4xx if (res.isClientError) { - 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; |