Fix winston logging to be primarily single-line (#554)

reactiflux · Aug 9, 2020 · ee2d70f · ee2d70f
1 parent 91ad0b1
commit ee2d70f
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/lib/logger.js b/lib/logger.js
@@ -1,23 +1,17 @@
 import winston, { format } from 'winston';
 import { inspect } from 'util';
 
+function simpleInspect(value) {
+  if (typeof value === 'string') return value;
+  return inspect(value, { depth: null });
+}
+
 function formatter(info) {
-  const stringifiedRest = inspect(
-    {
-      ...info,
-      level: undefined,
-      message: undefined,
-      splat: undefined
-    },
-    { depth: null }
-  );
+  const splat = info[Symbol.for('splat')] || [];
+  const stringifiedRest = splat.length > 0 ? ` ${splat.map(simpleInspect).join(' ')}` : '';
 
   const padding = (info.padding && info.padding[info.level]) || '';
-  if (stringifiedRest !== '{}') {
-    return `${info.timestamp} ${info.level}:${padding} ${info.message} ${stringifiedRest}`;
-  }
-
-  return `${info.timestamp} ${info.level}:${padding} ${info.message}`;
+  return `${info.timestamp} ${info.level}:${padding} ${info.message}${stringifiedRest}`;
 }
 
 const logger = winston.createLogger({
@@ -26,7 +20,7 @@ const logger = winston.createLogger({
   format: format.combine(
     format.colorize(),
     format.timestamp(),
-    format.printf(formatter)
+    format.printf(formatter),
   )
 });