X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fparse-log.ts;h=86aaa7994be9904fc51b3337441a2381c412ca96;hb=58d515e32fe1d0133435b3a5e550c6ff24906fff;hp=8aac6fbda704f0a60ad43024f2aad79d235834b5;hpb=47e0652b4a98916d4a1d012fbec61afd73a30565;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 8aac6fbda..86aaa7994 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -1,35 +1,61 @@
-import { createReadStream } from 'fs'
+import * as program from 'commander'
+import { createReadStream, readdirSync, statSync } from 'fs-extra'
 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
+program
+  .option('-l, --level [level]', 'Level log (debug/info/warn/error)')
+  .parse(process.argv)
 
-const logger = new winston.Logger({
+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
+
+  return `[${info.label}] ${toTimeFormat(info.timestamp)} ${info.level}: ${info.message}${additionalInfos}`
+})
+
+const logger = winston.createLogger({
   transports: [
     new winston.transports.Console({
-      level: 'debug',
-      label: label,
-      handleExceptions: true,
-      humanReadableUnhandledException: true,
-      json: false,
-      colorize: true,
-      prettyPrint: true
+      level: program['level'] || 'debug',
+      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 logFiles = readdirSync(CONFIG.STORAGE.LOG_DIR)
+const lastLogFile = getNewestFile(logFiles, CONFIG.STORAGE.LOG_DIR)
+
+const path = join(CONFIG.STORAGE.LOG_DIR, lastLogFile)
 console.log('Opening %s.', path)
 
 const rl = createInterface({
@@ -38,5 +64,30 @@ const rl = createInterface({
 
 rl.on('line', line => {
   const log = JSON.parse(line)
-  logLevels[log.level](log.message, log.stack)
+  // Don't know why but loggerFormat does not remove splat key
+  Object.assign(log, { splat: undefined })
+
+  logLevels[log.level](log)
 })
+
+function toTimeFormat (time: string) {
+  const timestamp = Date.parse(time)
+
+  if (isNaN(timestamp) === true) return 'Unknown date'
+
+  return new Date(timestamp).toISOString()
+}
+
+// Thanks: https://stackoverflow.com/a/37014317
+function getNewestFile (files: string[], basePath: string) {
+  const out = []
+
+  files.forEach(file => {
+    const stats = statSync(basePath + '/' + file)
+    if (stats.isFile()) out.push({ file, mtime: stats.mtime.getTime() })
+  })
+
+  out.sort((a, b) => b.mtime - a.mtime)
+
+  return (out.length > 0) ? out[ 0 ].file : ''
+}