aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'server/helpers')
-rw-r--r--server/helpers/logger.ts12
1 files changed, 10 insertions, 2 deletions
diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index a4bd41427..f1808849e 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -1,10 +1,11 @@
1// Thanks http://tostring.it/2014/06/23/advanced-logging-with-nodejs/ 1// Thanks http://tostring.it/2014/06/23/advanced-logging-with-nodejs/
2import { mkdirpSync } from 'fs-extra' 2import { mkdirpSync } from 'fs-extra'
3import { omit } from 'lodash'
3import * as path from 'path' 4import * as path from 'path'
5import { format as sqlFormat } from 'sql-formatter'
4import * as winston from 'winston' 6import * as winston from 'winston'
5import { FileTransportOptions } from 'winston/lib/winston/transports' 7import { FileTransportOptions } from 'winston/lib/winston/transports'
6import { CONFIG } from '../initializers/config' 8import { CONFIG } from '../initializers/config'
7import { omit } from 'lodash'
8import { LOG_FILENAME } from '../initializers/constants' 9import { LOG_FILENAME } from '../initializers/constants'
9 10
10const label = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT 11const label = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
@@ -39,13 +40,20 @@ function getLoggerReplacer () {
39} 40}
40 41
41const consoleLoggerFormat = winston.format.printf(info => { 42const consoleLoggerFormat = winston.format.printf(info => {
42 const obj = omit(info, 'label', 'timestamp', 'level', 'message') 43 const obj = omit(info, 'label', 'timestamp', 'level', 'message', 'sql')
43 44
44 let additionalInfos = JSON.stringify(obj, getLoggerReplacer(), 2) 45 let additionalInfos = JSON.stringify(obj, getLoggerReplacer(), 2)
45 46
46 if (additionalInfos === undefined || additionalInfos === '{}') additionalInfos = '' 47 if (additionalInfos === undefined || additionalInfos === '{}') additionalInfos = ''
47 else additionalInfos = ' ' + additionalInfos 48 else additionalInfos = ' ' + additionalInfos
48 49
50 if (info.sql) {
51 additionalInfos += '\n' + sqlFormat(info.sql, {
52 language: 'sql',
53 ident: ' '
54 })
55 }
56
49 return `[${info.label}] ${info.timestamp} ${info.level}: ${info.message}${additionalInfos}` 57 return `[${info.label}] ${info.timestamp} ${info.level}: ${info.message}${additionalInfos}`
50}) 58})
51 59