Merge 236a65c into 2cc9052

tsedio · May 29, 2022 · c23b31e · c23b31e
2 parents 2cc9052 + 236a65c
commit c23b31e
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 9 deletions.
diff --git a/packages/logger/src/core/LogEvent.ts b/packages/logger/src/core/LogEvent.ts
@@ -41,4 +41,16 @@ export class LogEvent {
   public get pid() {
     return this.context.get("pid");
   }
+
+  public isMessage() {
+    return this.data.length && typeof this.data[0] !== "object";
+  }
+
+  public getData() {
+    return !this.isMessage() ? this.data[0] : {};
+  }
+
+  public getMessage() {
+    return this.isMessage() ? this.data : undefined;
+  }
 }
diff --git a/packages/logger/test/core/LogEvent.spec.ts b/packages/logger/test/core/LogEvent.spec.ts
@@ -0,0 +1,33 @@
+import {LogEvent} from "../../src/core/LogEvent";
+import {levels, LogContext} from "@tsed/logger";
+import {expect} from "chai";
+
+describe("LogEvent", () => {
+  it("should create a new logevent (data)", () => {
+    const event = new LogEvent(
+      "category",
+      levels().INFO,
+      [{
+        test: "test"
+      }],
+      new LogContext()
+    );
+
+    expect(event.getData()).to.deep.eq({
+      "test": "test"
+    });
+    expect(event.getMessage()).to.deep.eq(undefined);
+  });
+
+  it("should create a new logevent (message)", () => {
+    const event = new LogEvent(
+      "category",
+      levels().INFO,
+      ["message"],
+      new LogContext()
+    );
+
+    expect(event.getData()).to.deep.eq({});
+    expect(event.getMessage()).to.deep.eq(["message"]);
+  });
+});
diff --git a/packages/loggly/src/LogglyAppender.ts b/packages/loggly/src/LogglyAppender.ts
@@ -49,21 +49,20 @@ export class LogglyAppender extends BaseAppender {
       // Replace the data property with the deTaggedData
       loggingEvent.data = deTaggedData;
 
-      const msg = this.layout(loggingEvent);
-
       this.openRequests += 1;
 
       this.logger.log(
         {
-          msg: msg,
+          data: this.getData(),
+          msg: this.getMessage(),
           level,
           category: loggingEvent.categoryName,
           hostname: os.hostname().toString()
         },
         additionalTags,
         (error) => {
           if (error) {
-            console.error("TsLogger.logglyAppender - error occurred: ", error);
+            console.error("Ts.ED Logger.logglyAppender - error occurred: ", error);
           }
 
           this.openRequests -= 1;

diff --git a/packages/logstash-http/src/LogStashHttpAppender.ts b/packages/logstash-http/src/LogStashHttpAppender.ts
@@ -17,7 +17,7 @@ function wrapErrorsWithInspect(items: any[]) {
 }
 
 function format(logData: any) {
-  return util.format(...wrapErrorsWithInspect(logData));
+  return logData ? util.format(...wrapErrorsWithInspect(logData)) : logData;
 }
 
 @Appender({name: "logstash-http"})
@@ -47,8 +47,6 @@ export class LogStashHttpAppender extends BaseAppender {
     const level = loggingEvent.level.toString().toLowerCase();
 
     if (level !== "off") {
-      const isMessage = loggingEvent.data.length && typeof loggingEvent.data[0] !== "object";
-
       const logstashEvent = [
         {
           index: {
@@ -57,8 +55,8 @@ export class LogStashHttpAppender extends BaseAppender {
           }
         },
         {
-          ...(!isMessage ? loggingEvent.data[0] : {}),
-          message: isMessage ? format(loggingEvent.data) : undefined,
+          ...loggingEvent.getData(),
+          message: format(loggingEvent.getMessage()),
           context: loggingEvent.context.toJSON(),
           level: loggingEvent.level.level / 100,
           level_name: level,