X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fparse-log.ts;h=3679dab747c02c632718da931f77507be4beafd2;hb=18ffaf2430df57ecc2150bdd89a7ecfd08bd1257;hp=410da3c61cf00de362d73a65d1aec6576ca3945d;hpb=e0783718079c1fcb6554ea20e762cfb0592de5b0;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index 410da3c61..3679dab74 100755
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -9,18 +9,23 @@ import * as winston from 'winston'
 import { labelFormatter } 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)')
   .parse(process.argv)
 
+const options = program.opts()
+
 const excludedKeys = {
   level: true,
   message: true,
   splat: true,
   timestamp: true,
-  label: true
+  label: true,
+  sql: true
 }
 function keysExcluder (key, value) {
   return excludedKeys[key] === true ? undefined : value
@@ -31,13 +36,24 @@ const loggerFormat = winston.format.printf((info) => {
   if (additionalInfos === '{}') additionalInfos = ''
   else additionalInfos = ' ' + additionalInfos
 
+  if (info.sql) {
+    if (CONFIG.LOG.PRETTIFY_SQL) {
+      additionalInfos += '\n' + sqlFormat(info.sql, {
+        language: 'sql',
+        indent: '  '
+      })
+    } else {
+      additionalInfos += ' - ' + info.sql
+    }
+  }
+
   return `[${info.label}] ${toTimeFormat(info.timestamp)} ${info.level}: ${info.message}${additionalInfos}`
 })
 
 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(),
@@ -62,7 +78,7 @@ 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) {
@@ -75,11 +91,16 @@ function run () {
       })
 
       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)
+        try {
+          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)
+        } catch (err) {
+          console.error('Cannot parse line.', inspect(line))
+          throw err
+        }
       })
 
       stream.once('close', () => res())
@@ -95,7 +116,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)