From 898f3fcd027cfe39204ab3f20d24ff332bd4f933 Mon Sep 17 00:00:00 2001 From: jlenon7 Date: Thu, 23 Apr 2026 13:23:42 -0300 Subject: [PATCH 1/3] feat: validate if logger is enabled to log exception --- package-lock.json | 4 +-- package.json | 2 +- src/handlers/AwsSqsDriverExceptionHandler.ts | 36 ++++++++++--------- .../DatabaseDriverExceptionHandler.ts | 36 ++++++++++--------- src/handlers/MemoryDriverExceptionHandler.ts | 36 ++++++++++--------- 5 files changed, 60 insertions(+), 54 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9bc4324..6ad68b2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@athenna/queue", - "version": "5.25.0", + "version": "5.27.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@athenna/queue", - "version": "5.25.0", + "version": "5.27.0", "license": "MIT", "dependencies": { "@aws-sdk/client-sqs": "^3.1019.0" diff --git a/package.json b/package.json index 1b1fe2c..3d97813 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@athenna/queue", - "version": "5.25.0", + "version": "5.27.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 da53f20..2d6ca98 100644 --- a/src/handlers/AwsSqsDriverExceptionHandler.ts +++ b/src/handlers/AwsSqsDriverExceptionHandler.ts @@ -38,23 +38,25 @@ export class AwsSqsDriverExceptionHandler extends ExceptionHandler { // @ts-ignore await super.handle({ job, error, driver, stopHeartbeat, requeueJitterMs }) - if (Config.is('worker.logger.prettifyException')) { - 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.enabled', false)) { + if (Config.is('worker.logger.prettifyException')) { + 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 (shouldRetry) { diff --git a/src/handlers/DatabaseDriverExceptionHandler.ts b/src/handlers/DatabaseDriverExceptionHandler.ts index f1aa7dd..23ff972 100644 --- a/src/handlers/DatabaseDriverExceptionHandler.ts +++ b/src/handlers/DatabaseDriverExceptionHandler.ts @@ -30,23 +30,25 @@ export class DatabaseDriverExceptionHandler extends ExceptionHandler { // @ts-ignore await super.handle({ job, error, driver, requeueJitterMs }) - if (Config.is('worker.logger.prettifyException')) { - 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.enabled', false)) { + if (Config.is('worker.logger.prettifyException')) { + 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 (!shouldRetry) { diff --git a/src/handlers/MemoryDriverExceptionHandler.ts b/src/handlers/MemoryDriverExceptionHandler.ts index 852d79f..942be62 100644 --- a/src/handlers/MemoryDriverExceptionHandler.ts +++ b/src/handlers/MemoryDriverExceptionHandler.ts @@ -32,23 +32,25 @@ export class MemoryDriverExceptionHandler extends ExceptionHandler { job.reservedUntil = null - if (Config.is('worker.logger.prettifyException')) { - 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.enabled', false)) { + if (Config.is('worker.logger.prettifyException')) { + 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 (shouldRetry) { From 0b54f13e7529425b136938d04b1f4954d527fcdb Mon Sep 17 00:00:00 2001 From: jlenon7 Date: Thu, 23 Apr 2026 13:25:42 -0300 Subject: [PATCH 2/3] feat: validate if logger is enabled to log exception --- src/handlers/AwsSqsDriverExceptionHandler.ts | 2 +- src/handlers/DatabaseDriverExceptionHandler.ts | 2 +- src/handlers/MemoryDriverExceptionHandler.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/handlers/AwsSqsDriverExceptionHandler.ts b/src/handlers/AwsSqsDriverExceptionHandler.ts index 2d6ca98..02d5418 100644 --- a/src/handlers/AwsSqsDriverExceptionHandler.ts +++ b/src/handlers/AwsSqsDriverExceptionHandler.ts @@ -38,7 +38,7 @@ export class AwsSqsDriverExceptionHandler extends ExceptionHandler { // @ts-ignore await super.handle({ job, error, driver, stopHeartbeat, requeueJitterMs }) - if (Config.is('worker.logger.enabled', false)) { + if (Config.is('worker.logger.enabled', true)) { if (Config.is('worker.logger.prettifyException')) { Log.channelOrVanilla('exception').error( await error.toAthennaException().prettify() diff --git a/src/handlers/DatabaseDriverExceptionHandler.ts b/src/handlers/DatabaseDriverExceptionHandler.ts index 23ff972..e555334 100644 --- a/src/handlers/DatabaseDriverExceptionHandler.ts +++ b/src/handlers/DatabaseDriverExceptionHandler.ts @@ -30,7 +30,7 @@ export class DatabaseDriverExceptionHandler extends ExceptionHandler { // @ts-ignore await super.handle({ job, error, driver, requeueJitterMs }) - if (Config.is('worker.logger.enabled', false)) { + if (Config.is('worker.logger.enabled', true)) { if (Config.is('worker.logger.prettifyException')) { Log.channelOrVanilla('exception').error( await error.toAthennaException().prettify() diff --git a/src/handlers/MemoryDriverExceptionHandler.ts b/src/handlers/MemoryDriverExceptionHandler.ts index 942be62..c10f626 100644 --- a/src/handlers/MemoryDriverExceptionHandler.ts +++ b/src/handlers/MemoryDriverExceptionHandler.ts @@ -32,7 +32,7 @@ export class MemoryDriverExceptionHandler extends ExceptionHandler { job.reservedUntil = null - if (Config.is('worker.logger.enabled', false)) { + if (Config.is('worker.logger.enabled', true)) { if (Config.is('worker.logger.prettifyException')) { Log.channelOrVanilla('exception').error( await error.toAthennaException().prettify() From 1e0e7d6f076e12a83f83773bb4dab3451ae69931 Mon Sep 17 00:00:00 2001 From: jlenon7 Date: Thu, 23 Apr 2026 13:26:07 -0300 Subject: [PATCH 3/3] feat: validate if logger is enabled to log exception --- src/handlers/AwsSqsDriverExceptionHandler.ts | 2 +- src/handlers/DatabaseDriverExceptionHandler.ts | 2 +- src/handlers/MemoryDriverExceptionHandler.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/handlers/AwsSqsDriverExceptionHandler.ts b/src/handlers/AwsSqsDriverExceptionHandler.ts index 02d5418..bd2ab30 100644 --- a/src/handlers/AwsSqsDriverExceptionHandler.ts +++ b/src/handlers/AwsSqsDriverExceptionHandler.ts @@ -39,7 +39,7 @@ export class AwsSqsDriverExceptionHandler extends ExceptionHandler { await super.handle({ job, error, driver, stopHeartbeat, requeueJitterMs }) if (Config.is('worker.logger.enabled', true)) { - if (Config.is('worker.logger.prettifyException')) { + if (Config.is('worker.logger.prettifyException', true)) { Log.channelOrVanilla('exception').error( await error.toAthennaException().prettify() ) diff --git a/src/handlers/DatabaseDriverExceptionHandler.ts b/src/handlers/DatabaseDriverExceptionHandler.ts index e555334..0903346 100644 --- a/src/handlers/DatabaseDriverExceptionHandler.ts +++ b/src/handlers/DatabaseDriverExceptionHandler.ts @@ -31,7 +31,7 @@ export class DatabaseDriverExceptionHandler extends ExceptionHandler { await super.handle({ job, error, driver, requeueJitterMs }) if (Config.is('worker.logger.enabled', true)) { - if (Config.is('worker.logger.prettifyException')) { + if (Config.is('worker.logger.prettifyException', true)) { Log.channelOrVanilla('exception').error( await error.toAthennaException().prettify() ) diff --git a/src/handlers/MemoryDriverExceptionHandler.ts b/src/handlers/MemoryDriverExceptionHandler.ts index c10f626..afebbab 100644 --- a/src/handlers/MemoryDriverExceptionHandler.ts +++ b/src/handlers/MemoryDriverExceptionHandler.ts @@ -33,7 +33,7 @@ export class MemoryDriverExceptionHandler extends ExceptionHandler { job.reservedUntil = null if (Config.is('worker.logger.enabled', true)) { - if (Config.is('worker.logger.prettifyException')) { + if (Config.is('worker.logger.prettifyException', true)) { Log.channelOrVanilla('exception').error( await error.toAthennaException().prettify() )