X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fparse-log.ts;h=410da3c61cf00de362d73a65d1aec6576ca3945d;hb=e0783718079c1fcb6554ea20e762cfb0592de5b0;hp=86aaa7994be9904fc51b3337441a2381c412ca96;hpb=c9d5c64f98c1f1fe7950de60c58edeaf3ace070d;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 86aaa7994..410da3c61 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -1,13 +1,18 @@
+import { registerTSPaths } from '../server/helpers/register-ts-paths'
+registerTSPaths()
+
 import * as program from 'commander'
-import { createReadStream, readdirSync, statSync } from 'fs-extra'
+import { createReadStream, readdir } from 'fs-extra'
 import { join } from 'path'
 import { createInterface } from 'readline'
 import * as winston from 'winston'
 import { labelFormatter } from '../server/helpers/logger'
-import { CONFIG } from '../server/initializers/constants'
+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)')
+  .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 = {
@@ -36,7 +41,7 @@ const logger = winston.createLogger({
       stderrLevels: [],
       format: winston.format.combine(
         winston.format.splat(),
-        labelFormatter,
+        labelFormatter(),
         winston.format.colorize(),
         loggerFormat
       )
@@ -52,42 +57,56 @@ const logLevels = {
   debug: logger.debug.bind(logger)
 }
 
-const logFiles = readdirSync(CONFIG.STORAGE.LOG_DIR)
-const lastLogFile = getNewestFile(logFiles, CONFIG.STORAGE.LOG_DIR)
+run()
+  .then(() => process.exit(0))
+  .catch(err => console.error(err))
 
-const path = join(CONFIG.STORAGE.LOG_DIR, lastLogFile)
-console.log('Opening %s.', path)
+function run () {
+  return new Promise(async res => {
+    const files = await getFiles()
 
-const rl = createInterface({
-  input: createReadStream(path)
-})
+    for (const file of files) {
+      console.log('Opening %s.', file)
 
-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 })
+      const stream = createReadStream(file)
 
-  logLevels[log.level](log)
-})
+      const rl = createInterface({
+        input: stream
+      })
 
-function toTimeFormat (time: string) {
-  const timestamp = Date.parse(time)
+      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 })
 
-  if (isNaN(timestamp) === true) return 'Unknown date'
+        logLevels[log.level](log)
+      })
 
-  return new Date(timestamp).toISOString()
+      stream.once('close', () => res())
+    }
+  })
 }
 
 // Thanks: https://stackoverflow.com/a/37014317
-function getNewestFile (files: string[], basePath: string) {
-  const out = []
+async function getNewestFile (files: string[], basePath: string) {
+  const sorted = await mtimeSortFilesDesc(files, basePath)
 
-  files.forEach(file => {
-    const stats = statSync(basePath + '/' + file)
-    if (stats.isFile()) out.push({ file, mtime: stats.mtime.getTime() })
-  })
+  return (sorted.length > 0) ? sorted[0].file : ''
+}
 
-  out.sort((a, b) => b.mtime - a.mtime)
+async function getFiles () {
+  if (program['files']) return program['files']
 
-  return (out.length > 0) ? out[ 0 ].file : ''
+  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) {
+  const timestamp = Date.parse(time)
+
+  if (isNaN(timestamp) === true) return 'Unknown date'
+
+  return new Date(timestamp).toISOString()
 }