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

diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 8aac6fbda..58e052b9f 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -1,42 +1,102 @@
-import { createReadStream } from 'fs'
+import { registerTSPaths } from '../server/helpers/register-ts-paths'
+registerTSPaths()
+
+import * as program from 'commander'
+import { createReadStream, readdir } from 'fs-extra'
 import { join } from 'path'
 import { createInterface } from 'readline'
 import * as winston from 'winston'
-import { readFileBufferPromise } from '../server/helpers/core-utils'
-import { CONFIG } from '../server/initializers/constants'
+import { labelFormatter } from '../server/helpers/logger'
+import { CONFIG } from '../server/initializers/config'
+import { mtimeSortFilesDesc } from '../shared/core-utils/logs/logs'
+
+program
+  .option('-l, --level [level]', 'Level log (debug/info/warn/error)')
+  .parse(process.argv)
+
+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 label = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
+  return `[${info.label}] ${toTimeFormat(info.timestamp)} ${info.level}: ${info.message}${additionalInfos}`
+})
 
-const logger = new winston.Logger({
+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')
-console.log('Opening %s.', path)
+run()
+  .then(() => process.exit(0))
+  .catch(err => console.error(err))
 
-const rl = createInterface({
-  input: createReadStream(path)
-})
+function run () {
+  return new Promise(async res => {
+    const logFiles = await readdir(CONFIG.STORAGE.LOG_DIR)
+    const lastLogFile = await getNewestFile(logFiles, CONFIG.STORAGE.LOG_DIR)
 
-rl.on('line', line => {
-  const log = JSON.parse(line)
-  logLevels[log.level](log.message, log.stack)
-})
+    const path = join(CONFIG.STORAGE.LOG_DIR, lastLogFile)
+    console.log('Opening %s.', path)
+
+    const stream = createReadStream(path)
+
+    const rl = createInterface({
+      input: stream
+    })
+
+    rl.on('line', line => {
+      const log = JSON.parse(line)
+      // Don't know why but loggerFormat does not remove splat key
+      Object.assign(log, { splat: undefined })
+
+      logLevels[log.level](log)
+    })
+
+    stream.once('close', () => res())
+  })
+}
+
+// Thanks: https://stackoverflow.com/a/37014317
+async function getNewestFile (files: string[], basePath: string) {
+  const sorted = await mtimeSortFilesDesc(files, basePath)
+
+  return (sorted.length > 0) ? sorted[0].file : ''
+}
+
+function toTimeFormat (time: string) {
+  const timestamp = Date.parse(time)
+
+  if (isNaN(timestamp) === true) return 'Unknown date'
+
+  return new Date(timestamp).toISOString()
+}