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

diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 9429512b7..86aaa7994 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -1,10 +1,15 @@
-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 { labelFormatter } from '../server/helpers/logger'
 import { CONFIG } from '../server/initializers/constants'
 
+program
+  .option('-l, --level [level]', 'Level log (debug/info/warn/error)')
+  .parse(process.argv)
+
 const excludedKeys = {
   level: true,
   message: true,
@@ -21,13 +26,13 @@ const loggerFormat = winston.format.printf((info) => {
   if (additionalInfos === '{}') additionalInfos = ''
   else additionalInfos = ' ' + additionalInfos
 
-  return `[${info.label}] ${new Date(info.timestamp).toISOString()} ${info.level}: ${info.message}${additionalInfos}`
+  return `[${info.label}] ${toTimeFormat(info.timestamp)} ${info.level}: ${info.message}${additionalInfos}`
 })
 
-const logger = new winston.createLogger({
+const logger = winston.createLogger({
   transports: [
     new winston.transports.Console({
-      level: 'debug',
+      level: program['level'] || 'debug',
       stderrLevels: [],
       format: winston.format.combine(
         winston.format.splat(),
@@ -47,7 +52,10 @@ const logLevels = {
   debug: logger.debug.bind(logger)
 }
 
-const path = join(CONFIG.STORAGE.LOG_DIR, 'peertube.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({
@@ -61,3 +69,25 @@ rl.on('line', line => {
 
   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 : ''
+}