X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fparse-log.ts;h=9429512b7eda907eab9e4e61a50e95bb1bb4181c;hb=c710f90a36f09cdaed1728e12b9ee455e9c850e7;hp=24a09c885009363d7d40a8971d76ef056618aa2e;hpb=afffe98839db7ccbfa9fb8b7d1413b97900fdc73;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 24a09c885..9429512b7 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -2,34 +2,52 @@ import { createReadStream } from 'fs'
 import { join } from 'path'
 import { createInterface } from 'readline'
 import * as winston from 'winston'
-import { readFileBufferPromise } from '../server/helpers/core-utils'
+import { labelFormatter } from '../server/helpers/logger'
 import { CONFIG } from '../server/initializers/constants'
 
-const label = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
+const excludedKeys = {
+  level: true,
+  message: true,
+  splat: true,
+  timestamp: true,
+  label: true
+}
+function keysExcluder (key, value) {
+  return excludedKeys[key] === true ? undefined : value
+}
+
+const loggerFormat = winston.format.printf((info) => {
+  let additionalInfos = JSON.stringify(info, keysExcluder, 2)
+  if (additionalInfos === '{}') additionalInfos = ''
+  else additionalInfos = ' ' + additionalInfos
 
-const logger = new winston.Logger({
+  return `[${info.label}] ${new Date(info.timestamp).toISOString()} ${info.level}: ${info.message}${additionalInfos}`
+})
+
+const logger = new winston.createLogger({
   transports: [
     new winston.transports.Console({
       level: 'debug',
-      label: label,
-      handleExceptions: true,
-      humanReadableUnhandledException: true,
-      json: false,
-      colorize: true,
-      prettyPrint: true
+      stderrLevels: [],
+      format: winston.format.combine(
+        winston.format.splat(),
+        labelFormatter,
+        winston.format.colorize(),
+        loggerFormat
+      )
     })
   ],
   exitOnError: true
 })
 
 const logLevels = {
-  error: logger.error,
-  warn: logger.warn,
-  info: logger.info,
-  debug: logger.debug
+  error: logger.error.bind(logger),
+  warn: logger.warn.bind(logger),
+  info: logger.info.bind(logger),
+  debug: logger.debug.bind(logger)
 }
 
-const path = join(CONFIG.STORAGE.LOG_DIR, 'all-logs.log')
+const path = join(CONFIG.STORAGE.LOG_DIR, 'peertube.log')
 console.log('Opening %s.', path)
 
 const rl = createInterface({
@@ -38,11 +56,8 @@ const rl = createInterface({
 
 rl.on('line', line => {
   const log = JSON.parse(line)
-  const additionalInfo: any = {}
-
-  Object.keys(log).forEach(logKey => {
-    if (logKey !== 'message' && logKey !== 'level') additionalInfo[logKey] = log[logKey]
-  })
+  // Don't know why but loggerFormat does not remove splat key
+  Object.assign(log, { splat: undefined })
 
-  logLevels[log.level](log.message, additionalInfo)
+  logLevels[log.level](log)
 })