import { join } from 'path'
import { createInterface } from 'readline'
import * as winston from 'winston'
-import { readFileBufferPromise } from '../server/helpers/core-utils'
+import { labelFormatter } from '../server/helpers/logger'
import { CONFIG } from '../server/initializers/constants'
-const label = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
+const excludedKeys = {
+ level: true,
+ message: true,
+ splat: true,
+ timestamp: true,
+ label: true
+}
+function keysExcluder (key, value) {
+ return excludedKeys[key] === true ? undefined : value
+}
+
+const loggerFormat = winston.format.printf((info) => {
+ let additionalInfos = JSON.stringify(info, keysExcluder, 2)
+ if (additionalInfos === '{}') additionalInfos = ''
+ else additionalInfos = ' ' + additionalInfos
-const logger = new winston.Logger({
+ return `[${info.label}] ${new Date(info.timestamp).toISOString()} ${info.level}: ${info.message}${additionalInfos}`
+})
+
+const logger = new winston.createLogger({
transports: [
new winston.transports.Console({
level: 'debug',
- label: label,
- handleExceptions: true,
- humanReadableUnhandledException: true,
- json: false,
- colorize: true,
- prettyPrint: true
+ stderrLevels: [],
+ format: winston.format.combine(
+ winston.format.splat(),
+ labelFormatter,
+ winston.format.colorize(),
+ loggerFormat
+ )
})
],
exitOnError: true
})
const logLevels = {
- error: logger.error,
- warn: logger.warn,
- info: logger.info,
- debug: logger.debug
+ error: logger.error.bind(logger),
+ warn: logger.warn.bind(logger),
+ info: logger.info.bind(logger),
+ debug: logger.debug.bind(logger)
}
-const path = join(CONFIG.STORAGE.LOG_DIR, 'all-logs.log')
+const path = join(CONFIG.STORAGE.LOG_DIR, 'peertube.log')
console.log('Opening %s.', path)
const rl = createInterface({
rl.on('line', line => {
const log = JSON.parse(line)
- logLevels[log.level](log.message)
+ // Don't know why but loggerFormat does not remove splat key
+ Object.assign(log, { splat: undefined })
+
+ logLevels[log.level](log)
})