X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fparse-log.ts;h=7a50d9f2fa3066401e8f43abc69bff071ad677e0;hb=a2fb5fb8b1007e3ce82e707917f5d9a37374e99b;hp=045348e8674d158a376249e9e2eb423b4693eb3f;hpb=cb5c2abc99c2e222fe18621f79cb68b805678e15;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 045348e86..7a50d9f2f 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -1,27 +1,28 @@
-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 { 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)')
   .option('-f, --files [file...]', 'Files to parse. If not provided, the script will parse the latest log file from config)')
+  .option('-t, --tags [tags...]', 'Display only lines with these tags')
+  .option('-nt, --not-tags [tags...]', 'Donrt display lines containing these tags')
   .parse(process.argv)
 
+const options = program.opts()
+
 const excludedKeys = {
   level: true,
   message: true,
   splat: true,
   timestamp: true,
+  tags: true,
   label: true,
   sql: true
 }
@@ -38,7 +39,7 @@ const loggerFormat = winston.format.printf((info) => {
     if (CONFIG.LOG.PRETTIFY_SQL) {
       additionalInfos += '\n' + sqlFormat(info.sql, {
         language: 'sql',
-        ident: '  '
+        tabWidth: 2
       })
     } else {
       additionalInfos += ' - ' + info.sql
@@ -51,7 +52,7 @@ const loggerFormat = winston.format.printf((info) => {
 const logger = winston.createLogger({
   transports: [
     new winston.transports.Console({
-      level: program['level'] || 'debug',
+      level: options.level || 'debug',
       stderrLevels: [],
       format: winston.format.combine(
         winston.format.splat(),
@@ -76,10 +77,12 @@ run()
   .catch(err => console.error(err))
 
 function run () {
-  return new Promise(async res => {
+  return new Promise<void>(async res => {
     const files = await getFiles()
 
     for (const file of files) {
+      if (file === 'peertube-audit.log') continue
+
       console.log('Opening %s.', file)
 
       const stream = createReadStream(file)
@@ -91,6 +94,14 @@ function run () {
       rl.on('line', line => {
         try {
           const log = JSON.parse(line)
+          if (options.tags && !containsTags(log.tags, options.tags)) {
+            return
+          }
+
+          if (options.notTags && containsTags(log.tags, options.notTags)) {
+            return
+          }
+
           // Don't know why but loggerFormat does not remove splat key
           Object.assign(log, { splat: undefined })
 
@@ -114,7 +125,7 @@ async function getNewestFile (files: string[], basePath: string) {
 }
 
 async function getFiles () {
-  if (program['files']) return program['files']
+  if (options.files) return options.files
 
   const logFiles = await readdir(CONFIG.STORAGE.LOG_DIR)
 
@@ -127,5 +138,18 @@ 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[]) {
+  if (!loggerTags) return false
+
+  for (const lt of loggerTags) {
+    for (const ot of optionsTags) {
+      if (lt === ot) return true
+    }
+  }
+
+  return false
 }