X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Flogger.ts;h=d92381a2c72e1ed715dbe6230742ad0c402117d7;hb=1d6e5dfc376f3c0c2120055cc093161e76419f98;hp=6a02f680abbb4437276b046b1d877be6a0bc9c96;hpb=23e27dd53599be65b2dc2968448ce155a00a96c9;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index 6a02f680a..d92381a2c 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -18,18 +18,36 @@ const excludedKeys = {
   label: true
 }
 function keysExcluder (key, value) {
-  return excludedKeys[key] === true ? undefined : value
+  if (excludedKeys[key] === true) return undefined
+
+  if (key === 'err') return value.stack
+
+  return 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
+
+  if (info.message && info.message.stack !== undefined) info.message = info.message.stack
+  return `[${info.label}] ${info.timestamp} ${info.level}: ${info.message}${additionalInfos}`
+})
+
+const jsonLoggerFormat = winston.format.printf(infoArg => {
+  let info = infoArg.err
+    ? Object.assign({}, infoArg, { err: infoArg.err.stack })
+    : infoArg
+
+  if (infoArg.message && infoArg.message.stack !== undefined) {
+    info = Object.assign({}, info, { message: infoArg.message.stack })
+  }
 
-  return `[${info.label}] ${info.timestamp} ${info.level}: ${info.message} ${additionalInfos}`
+  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
@@ -44,10 +62,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({
@@ -58,18 +76,46 @@ const logger = new winston.createLogger({
         winston.format.splat(),
         labelFormatter,
         winston.format.colorize(),
-        loggerFormat
+        consoleLoggerFormat
       )
     })
   ],
   exitOnError: true
 })
 
+function bunyanLogFactory (level: string) {
+  return function () {
+    let meta = null
+    let args = [].concat(arguments)
+
+    if (arguments[ 0 ] instanceof Error) {
+      meta = arguments[ 0 ].toString()
+      args = Array.prototype.slice.call(arguments, 1)
+      args.push(meta)
+    } else if (typeof (args[ 0 ]) !== 'string') {
+      meta = arguments[ 0 ]
+      args = Array.prototype.slice.call(arguments, 1)
+      args.push(meta)
+    }
+
+    logger[ level ].apply(logger, args)
+  }
+}
+const bunyanLogger = {
+  trace: bunyanLogFactory('debug'),
+  debug: bunyanLogFactory('debug'),
+  info: bunyanLogFactory('info'),
+  warn: bunyanLogFactory('warn'),
+  error: bunyanLogFactory('error'),
+  fatal: bunyanLogFactory('error')
+}
+
 // ---------------------------------------------------------------------------
 
 export {
   timestampFormatter,
   labelFormatter,
-  loggerFormat,
-  logger
+  consoleLoggerFormat,
+  logger,
+  bunyanLogger
 }