X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Flogger.ts;h=7d1d72f29d8b1d1fae4b858304777ecf1b11a152;hb=276d03ed1a469fd4e3579f92392b6f9a1567d1ca;hp=d8f2f687cb372b5169774ede5b8e5b0bb7ed8b41;hpb=4d4e5cd4dca78480ec7f40e747f424cd107376a4;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index d8f2f687c..7d1d72f29 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -2,35 +2,72 @@
 import * as mkdirp from 'mkdirp'
 import * as path from 'path'
 import * as winston from 'winston'
-
-// Do not use barrel (dependencies issues)
-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({
+// 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
+}
+
+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(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'
+})
+const labelFormatter = winston.format.label({
+  label
+})
+
+const logger = new winston.createLogger({
+  level: CONFIG.LOG.LEVEL,
   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,
       maxFiles: 5,
-      colorize: false,
-      prettyPrint: true
+      format: winston.format.combine(
+        timestampFormatter,
+        labelFormatter,
+        winston.format.splat(),
+        jsonLoggerFormat
+      )
     }),
     new winston.transports.Console({
-      level: 'debug',
-      label: label,
-      handleExceptions: true,
+      handleExcegiptions: true,
       humanReadableUnhandledException: true,
-      json: false,
-      colorize: true,
-      prettyPrint: true
+      format: winston.format.combine(
+        timestampFormatter,
+        winston.format.splat(),
+        labelFormatter,
+        winston.format.colorize(),
+        consoleLoggerFormat
+      )
     })
   ],
   exitOnError: true
@@ -38,4 +75,9 @@ const logger = new winston.Logger({
 
 // ---------------------------------------------------------------------------
 
-export { logger }
+export {
+  timestampFormatter,
+  labelFormatter,
+  consoleLoggerFormat,
+  logger
+}