X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Flogger.ts;h=e1e3a1fe20f9dbea9f6a3fb7f0c623fc6a4056bd;hb=cf9166cf2fb7b51a1137a259eed9338798c73500;hp=04ddf01a661f7e93d526212c18ffc7d7f7df57e0;hpb=85b4d9c52eb8a6b3b54152cca5c6edde481c863c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index 04ddf01a6..e1e3a1fe2 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -1,5 +1,5 @@
 // Thanks http://tostring.it/2014/06/23/advanced-logging-with-nodejs/
-import * as mkdirp from 'mkdirp'
+import { mkdirpSync } from 'fs-extra'
 import * as path from 'path'
 import * as winston from 'winston'
 import { CONFIG } from '../initializers'
@@ -7,38 +7,36 @@ import { CONFIG } from '../initializers'
 const label = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
 
 // Create the directory if it does not exist
-mkdirp.sync(CONFIG.STORAGE.LOG_DIR)
-
-// Use object for better performances (~ O(1))
-const excludedKeys = {
-  level: true,
-  message: true,
-  splat: true,
-  timestamp: true,
-  label: true
-}
-function keysExcluder (key, value) {
-  if (excludedKeys[key] === true) return undefined
+mkdirpSync(CONFIG.STORAGE.LOG_DIR)
+
+function loggerReplacer (key: string, value: any) {
+  if (value instanceof Error) {
+    const error = {}
 
-  if (key === 'err') return value.stack
+    Object.getOwnPropertyNames(value).forEach(key => error[ key ] = value[ key ])
+
+    return error
+  }
 
   return value
 }
 
 const consoleLoggerFormat = winston.format.printf(info => {
-  let additionalInfos = JSON.stringify(info, keysExcluder, 2)
-  if (additionalInfos === '{}') additionalInfos = ''
+  const obj = {
+    meta: info.meta,
+    err: info.err,
+    sql: info.sql
+  }
+
+  let additionalInfos = JSON.stringify(obj, loggerReplacer, 2)
+  if (additionalInfos === undefined || additionalInfos === '{}') additionalInfos = ''
   else additionalInfos = ' ' + additionalInfos
 
   return `[${info.label}] ${info.timestamp} ${info.level}: ${info.message}${additionalInfos}`
 })
 
-const jsonLoggerFormat = winston.format.printf(infoArg => {
-  let info = infoArg.err
-    ? Object.assign({}, infoArg, { err: infoArg.err.stack })
-    : infoArg
-
-  return JSON.stringify(info)
+const jsonLoggerFormat = winston.format.printf(info => {
+  return JSON.stringify(info, loggerReplacer)
 })
 
 const timestampFormatter = winston.format.timestamp({
@@ -50,16 +48,18 @@ const labelFormatter = winston.format.label({
 
 const logger = winston.createLogger({
   level: CONFIG.LOG.LEVEL,
+  format: winston.format.combine(
+    labelFormatter,
+    winston.format.splat()
+  ),
   transports: [
     new winston.transports.File({
       filename: path.join(CONFIG.STORAGE.LOG_DIR, 'peertube.log'),
       handleExceptions: true,
-      maxsize: 5242880,
+      maxsize: 1024 * 1024 * 30,
       maxFiles: 5,
       format: winston.format.combine(
         winston.format.timestamp(),
-        labelFormatter,
-        winston.format.splat(),
         jsonLoggerFormat
       )
     }),
@@ -67,8 +67,6 @@ const logger = winston.createLogger({
       handleExceptions: true,
       format: winston.format.combine(
         timestampFormatter,
-        winston.format.splat(),
-        labelFormatter,
         winston.format.colorize(),
         consoleLoggerFormat
       )
@@ -80,7 +78,8 @@ const logger = winston.createLogger({
 function bunyanLogFactory (level: string) {
   return function () {
     let meta = null
-    let args = [].concat(arguments)
+    let args: any[] = []
+    args.concat(arguments)
 
     if (arguments[ 0 ] instanceof Error) {
       meta = arguments[ 0 ].toString()
@@ -103,13 +102,13 @@ const bunyanLogger = {
   error: bunyanLogFactory('error'),
   fatal: bunyanLogFactory('error')
 }
-
 // ---------------------------------------------------------------------------
 
 export {
   timestampFormatter,
   labelFormatter,
   consoleLoggerFormat,
+  jsonLoggerFormat,
   logger,
   bunyanLogger
 }