X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fparse-log.ts;h=9e6653ca3ed73d42712b289153902a10343b9b58;hb=b6e0e6a31bdef7c0faebca96864eb334dd9e7ad7;hp=4e4f3df63c5d3d96aa064165b80f07a5584165a8;hpb=85b4d9c52eb8a6b3b54152cca5c6edde481c863c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 4e4f3df63..9e6653ca3 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -1,10 +1,14 @@
+import { registerTSPaths } from '../server/helpers/register-ts-paths'
+registerTSPaths()
+
 import * as program from 'commander'
-import { createReadStream, readdirSync } from 'fs'
+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)')
@@ -52,23 +56,42 @@ const logLevels = {
   debug: logger.debug.bind(logger)
 }
 
-const logFiles = readdirSync(CONFIG.STORAGE.LOG_DIR)
-const lastLogFile = logFiles[logFiles.length - 1]
+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 logFiles = await readdir(CONFIG.STORAGE.LOG_DIR)
+    const lastLogFile = await getNewestFile(logFiles, CONFIG.STORAGE.LOG_DIR)
 
-const rl = createInterface({
-  input: createReadStream(path)
-})
+    const path = join(CONFIG.STORAGE.LOG_DIR, lastLogFile)
+    console.log('Opening %s.', path)
 
-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(path)
 
-  logLevels[log.level](log)
-})
+    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)