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

diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index 201ea2235..480c5b49e 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -9,69 +9,100 @@ const label = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
 // Create the directory if it does not exist
 mkdirp.sync(CONFIG.STORAGE.LOG_DIR)
 
-// Use object for better performances (~ O(1))
-const excludedKeys = {
-  level: true,
-  message: true,
-  splat: true,
-  timestamp: true,
-  label: true
-}
-function keysExcluder (key, value) {
-  return excludedKeys[key] === true ? undefined : value
+function loggerReplacer (key: string, value: any) {
+  if (value instanceof Error) {
+    const error = {}
+
+    Object.getOwnPropertyNames(value).forEach(key => error[ key ] = value[ key ])
+
+    return error
+  }
+
+  return value
 }
 
-const loggerFormat = winston.format.printf((info) => {
-  let additionalInfos = JSON.stringify(info, keysExcluder, 2)
-  if (additionalInfos === '{}') additionalInfos = ''
+const consoleLoggerFormat = winston.format.printf(info => {
+  let additionalInfos = JSON.stringify(info.meta || info.err, loggerReplacer, 2)
+  if (additionalInfos === undefined || 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(info => {
+  return JSON.stringify(info, loggerReplacer)
+})
+
 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
 })
 
-const logger = new winston.createLogger({
+const logger = winston.createLogger({
   level: CONFIG.LOG.LEVEL,
+  format: winston.format.combine(
+    labelFormatter,
+    winston.format.splat()
+  ),
   transports: [
     new winston.transports.File({
       filename: path.join(CONFIG.STORAGE.LOG_DIR, 'peertube.log'),
       handleExceptions: true,
-      maxsize: 5242880,
+      maxsize: 1024 * 1024 * 30,
       maxFiles: 5,
       format: winston.format.combine(
-        timestampFormatter,
-        labelFormatter,
-        winston.format.splat(),
-        winston.format.json()
+        winston.format.timestamp(),
+        jsonLoggerFormat
       )
     }),
     new winston.transports.Console({
       handleExceptions: true,
-      humanReadableUnhandledException: true,
       format: winston.format.combine(
         timestampFormatter,
-        winston.format.splat(),
-        labelFormatter,
         winston.format.colorize(),
-        loggerFormat
+        consoleLoggerFormat
       )
     })
   ],
   exitOnError: true
 })
 
+function bunyanLogFactory (level: string) {
+  return function () {
+    let meta = null
+    let args: any[] = []
+    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,
+  jsonLoggerFormat,
+  logger,
+  bunyanLogger
 }