X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Flogger.ts;h=e0b904950828f5822af4d0bf34b722287f396bd0;hb=f47776e265a45859aaf8519d7de85c6f35fdf40a;hp=201ea2235cd39ac36b620b7a48b6c260c9df53f6;hpb=1e9d7b60cd93ad5d1aed47fd157f1993d4b4eac0;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index 201ea2235..e0b904950 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -21,7 +21,7 @@ function keysExcluder (key, value) {
   return excludedKeys[key] === true ? undefined : value
 }
 
-const loggerFormat = winston.format.printf((info) => {
+const consoleLoggerFormat = winston.format.printf(info => {
   let additionalInfos = JSON.stringify(info, keysExcluder, 2)
   if (additionalInfos === '{}') additionalInfos = ''
   else additionalInfos = ' ' + additionalInfos
@@ -30,8 +30,14 @@ const loggerFormat = winston.format.printf((info) => {
   return `[${info.label}] ${info.timestamp} ${info.level}: ${info.message}${additionalInfos}`
 })
 
+const jsonLoggerFormat = winston.format.printf(info => {
+  if (info.message && info.message.stack !== undefined) info.message = info.message.stack
+
+  return JSON.stringify(info)
+})
+
 const timestampFormatter = winston.format.timestamp({
-  format: 'YYYY-MM-dd HH:mm:ss.SSS'
+  format: 'YYYY-MM-DD HH:mm:ss.SSS'
 })
 const labelFormatter = winston.format.label({
   label
@@ -46,10 +52,10 @@ const logger = new winston.createLogger({
       maxsize: 5242880,
       maxFiles: 5,
       format: winston.format.combine(
-        timestampFormatter,
+        winston.format.timestamp(),
         labelFormatter,
         winston.format.splat(),
-        winston.format.json()
+        jsonLoggerFormat
       )
     }),
     new winston.transports.Console({
@@ -60,7 +66,7 @@ const logger = new winston.createLogger({
         winston.format.splat(),
         labelFormatter,
         winston.format.colorize(),
-        loggerFormat
+        consoleLoggerFormat
       )
     })
   ],
@@ -72,6 +78,6 @@ const logger = new winston.createLogger({
 export {
   timestampFormatter,
   labelFormatter,
-  loggerFormat,
+  consoleLoggerFormat,
   logger
 }