diff options
Diffstat (limited to 'packages/backend/src/queue')
| -rw-r--r-- | packages/backend/src/queue/QueueProcessorService.ts | 2 | ||||
| -rw-r--r-- | packages/backend/src/queue/processors/InboxProcessorService.ts | 13 |
2 files changed, 3 insertions, 12 deletions
diff --git a/packages/backend/src/queue/QueueProcessorService.ts b/packages/backend/src/queue/QueueProcessorService.ts index 33c2d02dd8..297edfd545 100644 --- a/packages/backend/src/queue/QueueProcessorService.ts +++ b/packages/backend/src/queue/QueueProcessorService.ts @@ -349,7 +349,7 @@ export class QueueProcessorService implements OnApplicationShutdown { }); } }) - .on('error', (err: Error) => logger.error(`error ${err.name}: ${err.message}`, { e: renderError(err) })) + .on('error', (err: Error) => logger.error('inbox error:', renderError(err))) .on('stalled', (jobId) => logger.warn(`stalled id=${jobId}`)); } //#endregion 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; |