2 files changed, 7 insertions, 3 deletions

diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index f1808849e..0548dfd5b 100644
--- 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 ba79b4ea1..c7ef9b497 100644
--- 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: {