fix(seq): fix seq appender

tsedio · Sep 15, 2023 · 833e747 · 833e747
1 parent a764419
commit 833e747
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 45 deletions.
diff --git a/package.json b/package.json
@@ -113,4 +113,4 @@
     ]
   },
   "packageManager": "yarn@3.2.1"
-}
+}
diff --git a/packages/connect/package.json b/packages/connect/package.json
@@ -47,4 +47,4 @@
   "peerDependencies": {
     "@tsed/logger": "6.6.2"
   }
-}
+}
diff --git a/packages/file/package.json b/packages/file/package.json
@@ -48,4 +48,4 @@
   "peerDependencies": {
     "@tsed/logger": "6.6.2"
   }
-}
+}
diff --git a/packages/insight/package.json b/packages/insight/package.json
@@ -48,4 +48,4 @@
   "peerDependencies": {
     "@tsed/logger": "6.6.2"
   }
-}
+}
diff --git a/packages/logentries/package.json b/packages/logentries/package.json
@@ -48,4 +48,4 @@
   "peerDependencies": {
     "@tsed/logger": "6.6.2"
   }
-}
+}
diff --git a/packages/logger/package.json b/packages/logger/package.json
@@ -45,6 +45,5 @@
   },
   "devDependencies": {
     "typescript": "5.0.4"
-  },
-  "peerDependencies": {}
-}
+  }
+}
diff --git a/packages/loggly/package.json b/packages/loggly/package.json
@@ -49,4 +49,4 @@
   "peerDependencies": {
     "@tsed/logger": "6.6.2"
   }
-}
+}
diff --git a/packages/logstash-http/package.json b/packages/logstash-http/package.json
@@ -52,4 +52,4 @@
   "peerDependencies": {
     "@tsed/logger": "6.6.2"
   }
-}
+}
diff --git a/packages/logstash-udp/package.json b/packages/logstash-udp/package.json
@@ -48,4 +48,4 @@
   "peerDependencies": {
     "@tsed/logger": "6.6.2"
   }
-}
+}
diff --git a/packages/rabbitmq/package.json b/packages/rabbitmq/package.json
@@ -49,4 +49,4 @@
   "peerDependencies": {
     "@tsed/logger": "6.6.2"
   }
-}
+}
diff --git a/packages/seq/package.json b/packages/seq/package.json
@@ -48,4 +48,4 @@
   "peerDependencies": {
     "@tsed/logger": "6.6.2"
   }
-}
+}
diff --git 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
@@ -48,4 +48,4 @@
   "peerDependencies": {
     "@tsed/logger": "6.6.2"
   }
-}
+}
diff --git a/packages/smtp/package.json b/packages/smtp/package.json
@@ -48,4 +48,4 @@
   "peerDependencies": {
     "@tsed/logger": "6.6.2"
   }
-}
+}
diff --git a/yarn.lock b/yarn.lock
@@ -3196,98 +3196,98 @@ __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
 
 "@tsed/logger-file@workspace:packages/file":
   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
 
 "@tsed/logger-insight@workspace:packages/insight":
   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
 
 "@tsed/logger-logentries@workspace:packages/logentries":
   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
 
 "@tsed/logger-loggly@workspace:packages/loggly":
   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
 
 "@tsed/logger-logstash-http@workspace:packages/logstash-http":
   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
 
 "@tsed/logger-logstash-udp@workspace:packages/logstash-udp":
   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
 
 "@tsed/logger-rabbitmq@workspace:packages/rabbitmq":
   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,27 +3360,27 @@ __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
 
 "@tsed/logger-smtp@workspace:packages/smtp":
   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: