X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Flogger.ts;h=04a19a9c61adb537cb42249176f67d6f99adf028;hb=4a5ccac5f1df4cbe1f016d1b6aad0a334bba33ae;hp=8d809d16d62f4efa9c3b3a489a10c48c3e99177f;hpb=8d468a16fd33ec2660c3c59b3f7def53eb0cc4a1;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index 8d809d16d..04a19a9c6 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -2,38 +2,107 @@
 import * as mkdirp from 'mkdirp'
 import * as path from 'path'
 import * as winston from 'winston'
-import { CONFIG } from '../initializers/constants'
+import { CONFIG } from '../initializers'
 
 const label = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
 
 // Create the directory if it does not exist
 mkdirp.sync(CONFIG.STORAGE.LOG_DIR)
 
-const logger = new winston.Logger({
+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 consoleLoggerFormat = winston.format.printf(info => {
+  let additionalInfos = JSON.stringify(info.meta, loggerReplacer, 2)
+  if (additionalInfos === undefined || additionalInfos === '{}') additionalInfos = ''
+  else additionalInfos = ' ' + additionalInfos
+
+  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'
+})
+const labelFormatter = winston.format.label({
+  label
+})
+
+const logger = winston.createLogger({
+  level: CONFIG.LOG.LEVEL,
+  format: winston.format.combine(
+    labelFormatter,
+    winston.format.splat()
+  ),
   transports: [
     new winston.transports.File({
-      level: 'debug',
-      filename: path.join(CONFIG.STORAGE.LOG_DIR, 'all-logs.log'),
+      filename: path.join(CONFIG.STORAGE.LOG_DIR, 'peertube.log'),
       handleExceptions: true,
-      json: true,
-      maxsize: 5242880,
+      maxsize: 1024 * 1024 * 30,
       maxFiles: 5,
-      colorize: false,
-      prettyPrint: true
+      format: winston.format.combine(
+        winston.format.timestamp(),
+        jsonLoggerFormat
+      )
     }),
     new winston.transports.Console({
-      level: 'debug',
-      label: label,
       handleExceptions: true,
-      humanReadableUnhandledException: true,
-      json: false,
-      colorize: true,
-      prettyPrint: true
+      format: winston.format.combine(
+        timestampFormatter,
+        winston.format.colorize(),
+        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 { logger }
+export {
+  timestampFormatter,
+  labelFormatter,
+  consoleLoggerFormat,
+  jsonLoggerFormat,
+  logger,
+  bunyanLogger
+}