X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fparse-log.ts;h=86aaa7994be9904fc51b3337441a2381c412ca96;hb=5c142a4bab955d2dbe831efd537c2fe52246db13;hp=7e804b3f9a9e6a6111aeab830e544cec0da2afe2;hpb=23e27dd53599be65b2dc2968448ce155a00a96c9;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 7e804b3f9..86aaa7994 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -1,17 +1,40 @@
-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, loggerFormat, timestampFormatter } from '../server/helpers/logger'
+import { labelFormatter } from '../server/helpers/logger'
 import { CONFIG } from '../server/initializers/constants'
 
-const logger = new winston.createLogger({
+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
+
+  return `[${info.label}] ${toTimeFormat(info.timestamp)} ${info.level}: ${info.message}${additionalInfos}`
+})
+
+const logger = winston.createLogger({
   transports: [
     new winston.transports.Console({
-      level: 'debug',
+      level: program['level'] || 'debug',
       stderrLevels: [],
       format: winston.format.combine(
-        timestampFormatter,
         winston.format.splat(),
         labelFormatter,
         winston.format.colorize(),
@@ -29,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({
@@ -43,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 : ''
+}