Fix logging of arguments

NeKzor · Apr 5, 2024 · 299099e · 299099e
1 parent 37585ed
commit 299099e
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 11 deletions.
diff --git a/src/bot/utils/logger.ts b/src/bot/utils/logger.ts
@@ -42,12 +42,28 @@ const formatDatetime = (datetime: Date) => {
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 };
 
-const consoleFormatter: _log.FormatterFunction = ({ datetime, level, levelName, msg }) => {
-  return `${formatDatetime(datetime)} ${formatLevel(level, levelName)} ${msg}`;
+// deno-lint-ignore no-explicit-any
+const formatArgs = (args: string | any | any[]): string => {
+  if (typeof args === 'string') {
+    return args;
+  }
+  // deno-lint-ignore no-explicit-any
+  return args.map((arg: any) => {
+    if (typeof arg === 'string') {
+      return arg;
+    }
+    return JSON.stringify(arg);
+  }).join(' ');
+};
+
+const consoleFormatter: _log.FormatterFunction = ({ datetime, level, levelName, msg, args }) => {
+  return `${formatDatetime(datetime)} ${formatLevel(level, levelName)} ${msg}${
+    args.length ? ' ' + formatArgs(args) : ''
+  }`;
 };
 
-const fileFormatter: _log.FormatterFunction = ({ datetime, levelName, msg }) => {
-  return `${formatDatetime(datetime)} ${levelName} ${msg}`;
+const fileFormatter: _log.FormatterFunction = ({ datetime, levelName, msg, args }) => {
+  return `${formatDatetime(datetime)} ${levelName} ${msg}${args.length ? ' ' + formatArgs(args) : ''}`;
 };
 
 _log.setup({

diff --git a/src/client/logger.ts b/src/client/logger.ts
@@ -35,13 +35,29 @@ const formatDatetime = (datetime: Date) => {
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 };
 
-const consoleFormatter: _log.FormatterFunction = ({ datetime, level, levelName, msg }) => {
-  return `${formatDatetime(datetime)} ${formatLevel(level, levelName)} ${msg}`;
+// deno-lint-ignore no-explicit-any
+const formatArgs = (args: string | any | any[]): string => {
+  if (typeof args === 'string') {
+    return args;
+  }
+  // deno-lint-ignore no-explicit-any
+  return args.map((arg: any) => {
+    if (typeof arg === 'string') {
+      return arg;
+    }
+    return JSON.stringify(arg);
+  }).join(' ');
+};
+
+const consoleFormatter: _log.FormatterFunction = ({ datetime, level, levelName, msg, args }) => {
+  return `${formatDatetime(datetime)} ${formatLevel(level, levelName)} ${msg}${
+    args.length ? ' ' + formatArgs(args) : ''
+  }`;
 };
 
 _log.setup({
   handlers: {
-    default: new _log.ConsoleHandler('DEBUG', {
+    console: new _log.ConsoleHandler('DEBUG', {
       useColors: false,
       formatter: consoleFormatter,
     }),

diff --git a/src/server/logger.ts b/src/server/logger.ts
@@ -42,12 +42,28 @@ const formatDatetime = (datetime: Date) => {
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 };
 
-const consoleFormatter: _log.FormatterFunction = ({ datetime, level, levelName, msg }) => {
-  return `${formatDatetime(datetime)} ${formatLevel(level, levelName)} ${msg}`;
+// deno-lint-ignore no-explicit-any
+const formatArgs = (args: string | any | any[]): string => {
+  if (typeof args === 'string') {
+    return args;
+  }
+  // deno-lint-ignore no-explicit-any
+  return args.map((arg: any) => {
+    if (typeof arg === 'string') {
+      return arg;
+    }
+    return JSON.stringify(arg);
+  }).join(' ');
+};
+
+const consoleFormatter: _log.FormatterFunction = ({ datetime, level, levelName, msg, args }) => {
+  return `${formatDatetime(datetime)} ${formatLevel(level, levelName)} ${msg}${
+    args.length ? ' ' + formatArgs(args) : ''
+  }`;
 };
 
-const fileFormatter: _log.FormatterFunction = ({ datetime, levelName, msg }) => {
-  return `${formatDatetime(datetime)} ${levelName} ${msg}`;
+const fileFormatter: _log.FormatterFunction = ({ datetime, levelName, msg, args }) => {
+  return `${formatDatetime(datetime)} ${levelName} ${msg}${args.length ? ' ' + formatArgs(args) : ''}`;
 };
 
 export const installLogger = (moduleName: string) => {