diff --git a/package.json b/package.json index 793e3286..b51eb3c3 100644 --- a/package.json +++ b/package.json @@ -113,4 +113,4 @@ ] }, "packageManager": "yarn@3.2.1" -} \ No newline at end of file +} diff --git a/packages/connect/package.json b/packages/connect/package.json index 83c5a3f5..d6a528c8 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -47,4 +47,4 @@ "peerDependencies": { "@tsed/logger": "6.6.2" } -} \ No newline at end of file +} diff --git a/packages/file/package.json b/packages/file/package.json index 9048c926..997f5f37 100644 --- a/packages/file/package.json +++ b/packages/file/package.json @@ -48,4 +48,4 @@ "peerDependencies": { "@tsed/logger": "6.6.2" } -} \ No newline at end of file +} diff --git a/packages/insight/package.json b/packages/insight/package.json index cbdd90cf..7a3efef1 100644 --- a/packages/insight/package.json +++ b/packages/insight/package.json @@ -48,4 +48,4 @@ "peerDependencies": { "@tsed/logger": "6.6.2" } -} \ No newline at end of file +} diff --git a/packages/logentries/package.json b/packages/logentries/package.json index 3a5be499..b8159d4d 100644 --- a/packages/logentries/package.json +++ b/packages/logentries/package.json @@ -48,4 +48,4 @@ "peerDependencies": { "@tsed/logger": "6.6.2" } -} \ No newline at end of file +} diff --git a/packages/logger/package.json b/packages/logger/package.json index 4e237636..ad481cac 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -45,6 +45,5 @@ }, "devDependencies": { "typescript": "5.0.4" - }, - "peerDependencies": {} -} \ No newline at end of file + } +} diff --git a/packages/loggly/package.json b/packages/loggly/package.json index 1ae9e6c6..bab528cd 100644 --- a/packages/loggly/package.json +++ b/packages/loggly/package.json @@ -49,4 +49,4 @@ "peerDependencies": { "@tsed/logger": "6.6.2" } -} \ No newline at end of file +} diff --git a/packages/logstash-http/package.json b/packages/logstash-http/package.json index 4df80d7a..5f2276c1 100644 --- a/packages/logstash-http/package.json +++ b/packages/logstash-http/package.json @@ -52,4 +52,4 @@ "peerDependencies": { "@tsed/logger": "6.6.2" } -} \ No newline at end of file +} diff --git a/packages/logstash-udp/package.json b/packages/logstash-udp/package.json index 0bbf5278..6a77dca6 100644 --- a/packages/logstash-udp/package.json +++ b/packages/logstash-udp/package.json @@ -48,4 +48,4 @@ "peerDependencies": { "@tsed/logger": "6.6.2" } -} \ No newline at end of file +} diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json index aba92a6b..ca7e7ccd 100644 --- a/packages/rabbitmq/package.json +++ b/packages/rabbitmq/package.json @@ -49,4 +49,4 @@ "peerDependencies": { "@tsed/logger": "6.6.2" } -} \ No newline at end of file +} diff --git a/packages/seq/package.json b/packages/seq/package.json index 3432beef..a330b365 100644 --- a/packages/seq/package.json +++ b/packages/seq/package.json @@ -48,4 +48,4 @@ "peerDependencies": { "@tsed/logger": "6.6.2" } -} \ No newline at end of file +} diff --git a/packages/seq/src/SeqAppender.ts b/packages/seq/src/SeqAppender.ts index af5ed9f9..14dd386a 100644 --- a/packages/seq/src/SeqAppender.ts +++ b/packages/seq/src/SeqAppender.ts @@ -30,8 +30,6 @@ export class SeqAppender extends BaseAppender { const level = loggingEvent.level.toString().toLowerCase(); if (level !== "off") { - const [current, ...data] = loggingEvent.data; - const additionalProps = [...loggingEvent.context.entries()].reduce((props, [key, value]) => { return { ...props, @@ -44,15 +42,14 @@ export class SeqAppender extends BaseAppender { level: LEVEL_NAMES[loggingEvent.level.toString()] || "Information", properties: { ...(this.config.options.additionalProps || {}), - ...additionalProps, - data + ...additionalProps } }; - if (typeof current === "string") { - seqEntry.messageTemplate = current.replace(/\[1m|\[22m/g, ""); + if (loggingEvent.isMessage()) { + seqEntry.messageTemplate = loggingEvent.getData().replace(/\[1m|\[22m/g, ""); } else { - let {message, msg, err, error, stack, v, ...props} = data[0]; + let {message, msg, err, error, stack, v, ...props} = loggingEvent.getData(); // Get the properties from the error let {message: errMessage, stack: errStack, ...errorProps} = err || error || {}; diff --git a/packages/slack/package.json b/packages/slack/package.json index def4f81d..a6609c8d 100644 --- a/packages/slack/package.json +++ b/packages/slack/package.json @@ -48,4 +48,4 @@ "peerDependencies": { "@tsed/logger": "6.6.2" } -} \ No newline at end of file +} diff --git a/packages/smtp/package.json b/packages/smtp/package.json index feabc757..fc62bc3a 100644 --- a/packages/smtp/package.json +++ b/packages/smtp/package.json @@ -48,4 +48,4 @@ "peerDependencies": { "@tsed/logger": "6.6.2" } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index c5ed7d4b..fb13869f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3196,10 +3196,10 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/logger-connect@workspace:packages/connect" dependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 tslib: 2.3.1 peerDependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 languageName: unknown linkType: soft @@ -3207,11 +3207,11 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/logger-file@workspace:packages/file" dependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 streamroller: ^3.1.5 tslib: 2.3.1 peerDependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 languageName: unknown linkType: soft @@ -3219,11 +3219,11 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/logger-insight@workspace:packages/insight" dependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 r7insight_node: 3.2.1 tslib: 2.3.1 peerDependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 languageName: unknown linkType: soft @@ -3231,11 +3231,11 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/logger-logentries@workspace:packages/logentries" dependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 le_node: ^1.8.0 tslib: 2.3.1 peerDependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 languageName: unknown linkType: soft @@ -3243,12 +3243,12 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/logger-loggly@workspace:packages/loggly" dependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 "@types/node-loggly-bulk": ^2.2.1 node-loggly-bulk: ^3.0.1 tslib: 2.3.1 peerDependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 languageName: unknown linkType: soft @@ -3256,14 +3256,14 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/logger-logstash-http@workspace:packages/logstash-http" dependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 "@types/uuid": ^9.0.1 axios: 0.27.2 axios-retry: ^3.3.1 tslib: 2.3.1 uuid: ^9.0.0 peerDependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 languageName: unknown linkType: soft @@ -3271,10 +3271,10 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/logger-logstash-udp@workspace:packages/logstash-udp" dependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 tslib: 2.3.1 peerDependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 languageName: unknown linkType: soft @@ -3282,12 +3282,12 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/logger-rabbitmq@workspace:packages/rabbitmq" dependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 "@types/amqplib": ^0.8.2 amqplib: 0.10.3 tslib: 2.3.1 peerDependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 languageName: unknown linkType: soft @@ -3347,11 +3347,11 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/logger-seq@workspace:packages/seq" dependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 seq-logging: 1.1.1 tslib: 2.3.1 peerDependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 languageName: unknown linkType: soft @@ -3360,10 +3360,10 @@ __metadata: resolution: "@tsed/logger-slack@workspace:packages/slack" dependencies: "@slack/web-api": ^6.7.0 - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 tslib: 2.3.1 peerDependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 languageName: unknown linkType: soft @@ -3371,16 +3371,16 @@ __metadata: version: 0.0.0-use.local resolution: "@tsed/logger-smtp@workspace:packages/smtp" dependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 "@types/nodemailer": 6.4.4 nodemailer: ^6.7.3 tslib: 2.3.1 peerDependencies: - "@tsed/logger": 6.6.1 + "@tsed/logger": 6.6.2 languageName: unknown linkType: soft -"@tsed/logger@6.6.1, @tsed/logger@workspace:packages/logger": +"@tsed/logger@6.6.2, @tsed/logger@workspace:packages/logger": version: 0.0.0-use.local resolution: "@tsed/logger@workspace:packages/logger" dependencies: