X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fparse-log.ts;h=6770f090b52830e36f5c886d890b878593752a8f;hb=38b4e733d2a11bf0e9164bc178f01cb18b15f6bd;hp=5f4480c8827c608e0101e56940a66d5673f6e71a;hpb=a786d8a08bf99f339bf16808f46e160404497ae2;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 5f4480c88..6770f090b 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -1,16 +1,13 @@
-import { registerTSPaths } from '../server/helpers/register-ts-paths'
-registerTSPaths()
-
-import * as program from 'commander'
+import { program } from 'commander'
 import { createReadStream, readdir } from 'fs-extra'
 import { join } from 'path'
+import { stdin } from 'process'
 import { createInterface } from 'readline'
+import { format as sqlFormat } from 'sql-formatter'
+import { inspect } from 'util'
 import * as winston from 'winston'
-import { labelFormatter } from '../server/helpers/logger'
+import { labelFormatter, mtimeSortFilesDesc } from '../server/helpers/logger'
 import { CONFIG } from '../server/initializers/config'
-import { mtimeSortFilesDesc } from '../shared/core-utils/logs/logs'
-import { inspect } from 'util'
-import { format as sqlFormat } from 'sql-formatter'
 
 program
   .option('-l, --level [level]', 'Level log (debug/info/warn/error)')
@@ -43,7 +40,7 @@ const loggerFormat = winston.format.printf((info) => {
     if (CONFIG.LOG.PRETTIFY_SQL) {
       additionalInfos += '\n' + sqlFormat(info.sql, {
         language: 'sql',
-        indent: '  '
+        tabWidth: 2
       })
     } else {
       additionalInfos += ' - ' + info.sql
@@ -80,42 +77,48 @@ run()
   .then(() => process.exit(0))
   .catch(err => console.error(err))
 
-function run () {
-  return new Promise<void>(async res => {
-    const files = await getFiles()
+async function run () {
+  const files = await getFiles()
 
-    for (const file of files) {
-      console.log('Opening %s.', file)
+  for (const file of files) {
+    if (file === 'peertube-audit.log') continue
 
-      const stream = createReadStream(file)
+    await readFile(file)
+  }
+}
 
-      const rl = createInterface({
-        input: stream
-      })
+function readFile (file: string) {
+  console.log('Opening %s.', file)
 
-      rl.on('line', line => {
-        try {
-          const log = JSON.parse(line)
-          if (options.tags && !containsTags(log.tags, options.tags)) {
-            return
-          }
+  const stream = file === '-' ? stdin : createReadStream(file)
 
-          if (options.notTags && containsTags(log.tags, options.notTags)) {
-            return
-          }
+  const rl = createInterface({
+    input: stream
+  })
 
-          // Don't know why but loggerFormat does not remove splat key
-          Object.assign(log, { splat: undefined })
+  return new Promise<void>(res => {
+    rl.on('line', line => {
+      try {
+        const log = JSON.parse(line)
+        if (options.tags && !containsTags(log.tags, options.tags)) {
+          return
+        }
 
-          logLevels[log.level](log)
-        } catch (err) {
-          console.error('Cannot parse line.', inspect(line))
-          throw err
+        if (options.notTags && containsTags(log.tags, options.notTags)) {
+          return
         }
-      })
 
-      stream.once('close', () => res())
-    }
+        // Don't know why but loggerFormat does not remove splat key
+        Object.assign(log, { splat: undefined })
+
+        logLevels[log.level](log)
+      } catch (err) {
+        console.error('Cannot parse line.', inspect(line))
+        throw err
+      }
+    })
+
+    stream.once('end', () => res())
   })
 }
 
@@ -140,7 +143,8 @@ function toTimeFormat (time: string) {
 
   if (isNaN(timestamp) === true) return 'Unknown date'
 
-  return new Date(timestamp).toISOString()
+  const d = new Date(timestamp)
+  return d.toLocaleString() + `.${d.getMilliseconds()}`
 }
 
 function containsTags (loggerTags: string[], optionsTags: string[]) {