X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fparse-log.ts;h=eb3534e5e3cbc4de839f81b655b11cb02c5e3014;hb=22078471fbe5a4dea6177bd1fa19da1cf887679e;hp=fe87db009b685324720a820e5cf884139686d264;hpb=74dc3bca2b14f5fd3fe80c394dfc34177a46db77;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index fe87db009..eb3534e5e 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -1,3 +1,6 @@
+import { registerTSPaths } from '../server/helpers/register-ts-paths'
+registerTSPaths()
+
 import * as program from 'commander'
 import { createReadStream, readdir } from 'fs-extra'
 import { join } from 'path'
@@ -5,10 +8,11 @@ import { createInterface } from 'readline'
 import * as winston from 'winston'
 import { labelFormatter } from '../server/helpers/logger'
 import { CONFIG } from '../server/initializers/config'
-import { mtimeSortFilesDesc } from '../shared/utils/logs/logs'
+import { mtimeSortFilesDesc } from '../shared/core-utils/logs/logs'
 
 program
   .option('-l, --level [level]', 'Level log (debug/info/warn/error)')
+  .option('-f, --files [file...]', 'Files to parse. If not provided, the script will parse the latest log file from config)')
   .parse(process.argv)
 
 const excludedKeys = {
@@ -37,7 +41,7 @@ const logger = winston.createLogger({
       stderrLevels: [],
       format: winston.format.combine(
         winston.format.splat(),
-        labelFormatter,
+        labelFormatter(),
         winston.format.colorize(),
         loggerFormat
       )
@@ -59,27 +63,32 @@ run()
 
 function run () {
   return new Promise(async res => {
-    const logFiles = await readdir(CONFIG.STORAGE.LOG_DIR)
-    const lastLogFile = await getNewestFile(logFiles, CONFIG.STORAGE.LOG_DIR)
+    const files = await getFiles()
 
-    const path = join(CONFIG.STORAGE.LOG_DIR, lastLogFile)
-    console.log('Opening %s.', path)
+    for (const file of files) {
+      console.log('Opening %s.', file)
 
-    const stream = createReadStream(path)
+      const stream = createReadStream(file)
 
-    const rl = createInterface({
-      input: stream
-    })
+      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 })
+      rl.on('line', line => {
+        try {
+          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)
-    })
+          logLevels[log.level](log)
+        } catch (err) {
+          console.error('Cannot parse line.', line)
+          throw err
+        }
+      })
 
-    stream.once('close', () => res())
+      stream.once('close', () => res())
+    }
   })
 }
 
@@ -87,7 +96,16 @@ function run () {
 async function getNewestFile (files: string[], basePath: string) {
   const sorted = await mtimeSortFilesDesc(files, basePath)
 
-  return (sorted.length > 0) ? sorted[ 0 ].file : ''
+  return (sorted.length > 0) ? sorted[0].file : ''
+}
+
+async function getFiles () {
+  if (program['files']) return program['files']
+
+  const logFiles = await readdir(CONFIG.STORAGE.LOG_DIR)
+
+  const filename = await getNewestFile(logFiles, CONFIG.STORAGE.LOG_DIR)
+  return [ join(CONFIG.STORAGE.LOG_DIR, filename) ]
 }
 
 function toTimeFormat (time: string) {