Skip to content

Commit 29469c5

Browse files
authored
Merge pull request #37 from AthennaIO/develop
fix(handlers): remove logger enabled validation on errors
2 parents d23a964 + dbc2e3c commit 29469c5

5 files changed

Lines changed: 54 additions & 60 deletions

File tree

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@athenna/queue",
3-
"version": "5.20.0",
3+
"version": "5.21.0",
44
"description": "The Athenna queue handler.",
55
"license": "MIT",
66
"author": "João Lenon <lenon@athenna.io>",

src/handlers/AwsSqsDriverExceptionHandler.ts

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,23 @@ export class AwsSqsDriverExceptionHandler extends ExceptionHandler {
3838
// @ts-ignore
3939
await super.handle({ job, error, driver, stopHeartbeat, requeueJitterMs })
4040

41-
if (Config.is('worker.logger.enabled', true)) {
42-
if (Config.is('worker.logger.prettifyException')) {
43-
Log.channelOrVanilla('exception').error(
44-
await error.toAthennaException().prettify()
45-
)
46-
} else {
47-
Log.channelOrVanilla('exception').error({
48-
msg: `failed to process job: ${error.message}`,
49-
queue: driver.queueName,
50-
deadletter: driver.deadletter,
51-
name: error.name,
52-
code: error.code,
53-
help: error.help,
54-
details: error.details,
55-
metadata: error.metadata,
56-
stack: error.stack,
57-
job
58-
})
59-
}
41+
if (Config.is('worker.logger.prettifyException')) {
42+
Log.channelOrVanilla('exception').error(
43+
await error.toAthennaException().prettify()
44+
)
45+
} else {
46+
Log.channelOrVanilla('exception').error({
47+
msg: `failed to process job: ${error.message}`,
48+
queue: driver.queueName,
49+
deadletter: driver.deadletter,
50+
name: error.name,
51+
code: error.code,
52+
help: error.help,
53+
details: error.details,
54+
metadata: error.metadata,
55+
stack: error.stack,
56+
job
57+
})
6058
}
6159

6260
if (shouldRetry) {

src/handlers/DatabaseDriverExceptionHandler.ts

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,23 @@ export class DatabaseDriverExceptionHandler extends ExceptionHandler {
3030
// @ts-ignore
3131
await super.handle({ job, error, driver, requeueJitterMs })
3232

33-
if (Config.is('worker.logger.enabled', true)) {
34-
if (Config.is('worker.logger.prettifyException')) {
35-
Log.channelOrVanilla('exception').error(
36-
await error.toAthennaException().prettify()
37-
)
38-
} else {
39-
Log.channelOrVanilla('exception').error({
40-
msg: `failed to process job: ${error.message}`,
41-
queue: driver.queueName,
42-
deadletter: driver.deadletter,
43-
name: error.name,
44-
code: error.code,
45-
help: error.help,
46-
details: error.details,
47-
metadata: error.metadata,
48-
stack: error.stack,
49-
job
50-
})
51-
}
33+
if (Config.is('worker.logger.prettifyException')) {
34+
Log.channelOrVanilla('exception').error(
35+
await error.toAthennaException().prettify()
36+
)
37+
} else {
38+
Log.channelOrVanilla('exception').error({
39+
msg: `failed to process job: ${error.message}`,
40+
queue: driver.queueName,
41+
deadletter: driver.deadletter,
42+
name: error.name,
43+
code: error.code,
44+
help: error.help,
45+
details: error.details,
46+
metadata: error.metadata,
47+
stack: error.stack,
48+
job
49+
})
5250
}
5351

5452
if (!shouldRetry) {

src/handlers/MemoryDriverExceptionHandler.ts

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,23 @@ export class MemoryDriverExceptionHandler extends ExceptionHandler {
3232

3333
job.reservedUntil = null
3434

35-
if (Config.is('worker.logger.enabled', true)) {
36-
if (Config.is('worker.logger.prettifyException')) {
37-
Log.channelOrVanilla('exception').error(
38-
await error.toAthennaException().prettify()
39-
)
40-
} else {
41-
Log.channelOrVanilla('exception').error({
42-
msg: `failed to process job: ${error.message}`,
43-
queue: driver.queueName,
44-
deadletter: driver.deadletter,
45-
name: error.name,
46-
code: error.code,
47-
help: error.help,
48-
details: error.details,
49-
metadata: error.metadata,
50-
stack: error.stack,
51-
job
52-
})
53-
}
35+
if (Config.is('worker.logger.prettifyException')) {
36+
Log.channelOrVanilla('exception').error(
37+
await error.toAthennaException().prettify()
38+
)
39+
} else {
40+
Log.channelOrVanilla('exception').error({
41+
msg: `failed to process job: ${error.message}`,
42+
queue: driver.queueName,
43+
deadletter: driver.deadletter,
44+
name: error.name,
45+
code: error.code,
46+
help: error.help,
47+
details: error.details,
48+
metadata: error.metadata,
49+
stack: error.stack,
50+
job
51+
})
5452
}
5553

5654
if (shouldRetry) {

0 commit comments

Comments
 (0)