Disable sql prettifier by default

It adds too much lines, leading to difficulties when reading dev logs

diff --git a/config/default.yaml b/config/default.yaml
index cbe6fa9ead8e40f659dda5e9fea84d97ce267073..e4a5ee727437ce0babcac3574f3431cebb5ff65c 100644 (file)
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -101,6 +101,7 @@ log:
     maxFiles: 20
   anonymizeIP: false
   log_ping_requests: true
+  prettify_sql: false
 
 trending:
   videos:

diff --git a/config/production.yaml.example b/config/production.yaml.example
index 88def3ad563f7c5a9321c39a95e4fbb0822acd87..f7b56cc4a5c8b66844135854f96fd1e8b4e6f443 100644 (file)
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -101,6 +101,7 @@ log:
     maxFiles: 20
   anonymizeIP: false
   log_ping_requests: true
+  prettify_sql: false
 
 trending:
   videos:

diff --git a/scripts/parse-log.ts b/scripts/parse-log.ts
index eb3534e5e3cbc4de839f81b655b11cb02c5e3014..065fe7e82ff5e7b7c678f3c1400bec09f88c2609 100755 (executable)
--- a/scripts/parse-log.ts
+++ b/scripts/parse-log.ts
@@ -9,6 +9,7 @@ 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'
 
 program
   .option('-l, --level [level]', 'Level log (debug/info/warn/error)')
@@ -82,7 +83,7 @@ function run () {
 
           logLevels[log.level](log)
         } catch (err) {
-          console.error('Cannot parse line.', line)
+          console.error('Cannot parse line.', inspect(line))
           throw err
         }
       })

diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index f1808849ee2ece2e1dc5a37eb26ab09a9976c0fe..0548dfd5ba4a6e1e4c4993ee21e95f366df0cf86 100644 (file)
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -40,14 +40,17 @@ function getLoggerReplacer () {
 }
 
 const consoleLoggerFormat = winston.format.printf(info => {
-  const obj = omit(info, 'label', 'timestamp', 'level', 'message', 'sql')
+  const toOmit = [ 'label', 'timestamp', 'level', 'message' ]
+  if (CONFIG.LOG.PRETTIFY_SQL) toOmit.push('sql')
+
+  const obj = omit(info, ...toOmit)
 
   let additionalInfos = JSON.stringify(obj, getLoggerReplacer(), 2)
 
   if (additionalInfos === undefined || additionalInfos === '{}') additionalInfos = ''
   else additionalInfos = ' ' + additionalInfos
 
-  if (info.sql) {
+  if (CONFIG.LOG.PRETTIFY_SQL && info.sql) {
     additionalInfos += '\n' + sqlFormat(info.sql, {
       language: 'sql',
       ident: '  '

diff --git a/server/initializers/config.ts b/server/initializers/config.ts
index ba79b4ea1d906ba68b94382d16f0cbd6599b171e..c7ef9b49705872a49fd227b2219cca64a85eae59 100644 (file)
--- a/server/initializers/config.ts
+++ b/server/initializers/config.ts
@@ -105,7 +105,8 @@ const CONFIG = {
       MAX_FILES: config.get<number>('log.rotation.maxFiles')
     },
     ANONYMIZE_IP: config.get<boolean>('log.anonymizeIP'),
-    LOG_PING_REQUESTS: config.get<boolean>('log.log_ping_requests')
+    LOG_PING_REQUESTS: config.get<boolean>('log.log_ping_requests'),
+    PRETTIFY_SQL: config.get<boolean>('log.prettify_sql')
   },
   TRENDING: {
     VIDEOS: {