From a1778124a9705da50d2e33fc2bba84e236cf2777 Mon Sep 17 00:00:00 2001 From: jlenon7 Date: Fri, 24 Apr 2026 11:12:59 -0300 Subject: [PATCH] fix: remove logger enabled validation in exception handlers --- package-lock.json | 4 +-- package.json | 2 +- src/handlers/AwsSqsDriverExceptionHandler.ts | 30 ++++++++----------- .../DatabaseDriverExceptionHandler.ts | 30 ++++++++----------- src/handlers/MemoryDriverExceptionHandler.ts | 30 ++++++++----------- 5 files changed, 39 insertions(+), 57 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6ad68b2..3e66a08 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@athenna/queue", - "version": "5.27.0", + "version": "5.28.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@athenna/queue", - "version": "5.27.0", + "version": "5.28.0", "license": "MIT", "dependencies": { "@aws-sdk/client-sqs": "^3.1019.0" diff --git a/package.json b/package.json index 3d97813..48bef70 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@athenna/queue", - "version": "5.27.0", + "version": "5.28.0", "description": "The Athenna queue handler.", "license": "MIT", "author": "João Lenon ", diff --git a/src/handlers/AwsSqsDriverExceptionHandler.ts b/src/handlers/AwsSqsDriverExceptionHandler.ts index bd2ab30..e10d4fb 100644 --- a/src/handlers/AwsSqsDriverExceptionHandler.ts +++ b/src/handlers/AwsSqsDriverExceptionHandler.ts @@ -38,25 +38,19 @@ export class AwsSqsDriverExceptionHandler extends ExceptionHandler { // @ts-ignore await super.handle({ job, error, driver, stopHeartbeat, requeueJitterMs }) - if (Config.is('worker.logger.enabled', true)) { - if (Config.is('worker.logger.prettifyException', true)) { - Log.channelOrVanilla('exception').error( - await error.toAthennaException().prettify() - ) - } else { - Log.channelOrVanilla('exception').error({ - msg: `failed to process job: ${error.message}`, - queue: driver.queueName, - deadletter: driver.deadletter, - name: error.name, - code: error.code, - help: error.help, - details: error.details, - metadata: error.metadata, - stack: error.stack, - job - }) + if (Config.is('worker.logger.prettifyException', true)) { + Log.channelOrVanilla('exception').error( + await error.toAthennaException().prettify() + ) + } else { + error.otherInfos = { + ...error.otherInfos, + queue: driver.queueName, + deadletter: driver.deadletter, + job } + + Log.channelOrVanilla('exception').error(error) } if (shouldRetry) { diff --git a/src/handlers/DatabaseDriverExceptionHandler.ts b/src/handlers/DatabaseDriverExceptionHandler.ts index 0903346..8c1ea81 100644 --- a/src/handlers/DatabaseDriverExceptionHandler.ts +++ b/src/handlers/DatabaseDriverExceptionHandler.ts @@ -30,25 +30,19 @@ export class DatabaseDriverExceptionHandler extends ExceptionHandler { // @ts-ignore await super.handle({ job, error, driver, requeueJitterMs }) - if (Config.is('worker.logger.enabled', true)) { - if (Config.is('worker.logger.prettifyException', true)) { - Log.channelOrVanilla('exception').error( - await error.toAthennaException().prettify() - ) - } else { - Log.channelOrVanilla('exception').error({ - msg: `failed to process job: ${error.message}`, - queue: driver.queueName, - deadletter: driver.deadletter, - name: error.name, - code: error.code, - help: error.help, - details: error.details, - metadata: error.metadata, - stack: error.stack, - job - }) + if (Config.is('worker.logger.prettifyException', true)) { + Log.channelOrVanilla('exception').error( + await error.toAthennaException().prettify() + ) + } else { + error.otherInfos = { + ...error.otherInfos, + queue: driver.queueName, + deadletter: driver.deadletter, + job } + + Log.channelOrVanilla('exception').error(error) } if (!shouldRetry) { diff --git a/src/handlers/MemoryDriverExceptionHandler.ts b/src/handlers/MemoryDriverExceptionHandler.ts index afebbab..5d8f7cb 100644 --- a/src/handlers/MemoryDriverExceptionHandler.ts +++ b/src/handlers/MemoryDriverExceptionHandler.ts @@ -32,25 +32,19 @@ export class MemoryDriverExceptionHandler extends ExceptionHandler { job.reservedUntil = null - if (Config.is('worker.logger.enabled', true)) { - if (Config.is('worker.logger.prettifyException', true)) { - Log.channelOrVanilla('exception').error( - await error.toAthennaException().prettify() - ) - } else { - Log.channelOrVanilla('exception').error({ - msg: `failed to process job: ${error.message}`, - queue: driver.queueName, - deadletter: driver.deadletter, - name: error.name, - code: error.code, - help: error.help, - details: error.details, - metadata: error.metadata, - stack: error.stack, - job - }) + if (Config.is('worker.logger.prettifyException', true)) { + Log.channelOrVanilla('exception').error( + await error.toAthennaException().prettify() + ) + } else { + error.otherInfos = { + ...error.otherInfos, + queue: driver.queueName, + deadletter: driver.deadletter, + job } + + Log.channelOrVanilla('exception').error(error) } if (shouldRetry) {