diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-12-21 16:57:06 +0000 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2024-12-22 15:28:21 -0500 |
| commit | e4047b407606f47adceef3492cc3834d1455ebfb (patch) | |
| tree | d3dc9721f237abb52e79c3cdc7bb89f94d112b3d /packages/backend/src | |
| parent | merge: Revert "Synchronize server startup" (!831) (diff) | |
| download | sharkey-e4047b407606f47adceef3492cc3834d1455ebfb.tar.gz sharkey-e4047b407606f47adceef3492cc3834d1455ebfb.tar.bz2 sharkey-e4047b407606f47adceef3492cc3834d1455ebfb.zip | |
rethrow everything but non-retryable HTTP errors
every job that ends without an exception will be considered
"completed" and not retried
Diffstat (limited to 'packages/backend/src')
| -rw-r--r-- | packages/backend/src/queue/processors/InboxProcessorService.ts | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts index 7dfa4ec704..7727a3e985 100644 --- a/packages/backend/src/queue/processors/InboxProcessorService.ts +++ b/packages/backend/src/queue/processors/InboxProcessorService.ts @@ -7,7 +7,6 @@ import { URL } from 'node:url'; import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common'; import httpSignature from '@peertube/http-signature'; import * as Bull from 'bullmq'; -import { AbortError } from 'node-fetch'; import type Logger from '@/logger.js'; import { FederatedInstanceService } from '@/core/FederatedInstanceService.js'; import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js'; @@ -245,16 +244,8 @@ export class InboxProcessorService implements OnApplicationShutdown { } } - if (e instanceof StatusError) { - if (e.isRetryable) { - return `temporary error ${e.statusCode}`; - } else { - return `skip: permanent error ${e.statusCode}`; - } - } - - if (e instanceof AbortError) { - return 'request aborted'; + if (e instanceof StatusError && !e.isRetryable) { + return `skip: permanent error ${e.statusCode}`; } throw e; |