X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Flogger.ts;h=b8ae28b3f12235d69b2d8c26430fcfb0f09bb6ca;hb=7024e9120b381b5b3201212f5a18f5cdc14e15ff;hp=6d369a8fbd421b432ebb938afe2a1ae02df70af8;hpb=e20015d744fe9d637bfa6924194f54eecbbd6722;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index 6d369a8fb..b8ae28b3f 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -1,28 +1,46 @@
 // 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'
+import { FileTransportOptions } from 'winston/lib/winston/transports'
+import { CONFIG } from '../initializers/config'
+import { omit } from 'lodash'
+import { LOG_FILENAME } from '../initializers/constants'
 
 const label = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
 
 // Create the directory if it does not exist
-mkdirp.sync(CONFIG.STORAGE.LOG_DIR)
+// FIXME: use async
+mkdirpSync(CONFIG.STORAGE.LOG_DIR)
 
-function loggerReplacer (key: string, value: any) {
-  if (value instanceof Error) {
-    const error = {}
+function getLoggerReplacer () {
+  const seen = new WeakSet()
 
-    Object.getOwnPropertyNames(value).forEach(key => error[ key ] = value[ key ])
+  // Thanks: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Cyclic_object_value#Examples
+  return (key: string, value: any) => {
+    if (typeof value === 'object' && value !== null) {
+      if (seen.has(value)) return
 
-    return error
-  }
+      seen.add(value)
+    }
+
+    if (value instanceof Error) {
+      const error = {}
+
+      Object.getOwnPropertyNames(value).forEach(key => { error[key] = value[key] })
+
+      return error
+    }
 
-  return value
+    return value
+  }
 }
 
 const consoleLoggerFormat = winston.format.printf(info => {
-  let additionalInfos = JSON.stringify(info.meta, loggerReplacer, 2)
+  const obj = omit(info, 'label', 'timestamp', 'level', 'message')
+
+  let additionalInfos = JSON.stringify(obj, getLoggerReplacer(), 2)
+
   if (additionalInfos === undefined || additionalInfos === '{}') additionalInfos = ''
   else additionalInfos = ' ' + additionalInfos
 
@@ -30,7 +48,7 @@ const consoleLoggerFormat = winston.format.printf(info => {
 })
 
 const jsonLoggerFormat = winston.format.printf(info => {
-  return JSON.stringify(info, loggerReplacer)
+  return JSON.stringify(info, getLoggerReplacer())
 })
 
 const timestampFormatter = winston.format.timestamp({
@@ -40,6 +58,20 @@ const labelFormatter = winston.format.label({
   label
 })
 
+const fileLoggerOptions: FileTransportOptions = {
+  filename: path.join(CONFIG.STORAGE.LOG_DIR, LOG_FILENAME),
+  handleExceptions: true,
+  format: winston.format.combine(
+    winston.format.timestamp(),
+    jsonLoggerFormat
+  )
+}
+
+if (CONFIG.LOG.ROTATION.ENABLED) {
+  fileLoggerOptions.maxsize = CONFIG.LOG.ROTATION.MAX_FILE_SIZE
+  fileLoggerOptions.maxFiles = CONFIG.LOG.ROTATION.MAX_FILES
+}
+
 const logger = winston.createLogger({
   level: CONFIG.LOG.LEVEL,
   format: winston.format.combine(
@@ -47,16 +79,7 @@ const logger = winston.createLogger({
     winston.format.splat()
   ),
   transports: [
-    new winston.transports.File({
-      filename: path.join(CONFIG.STORAGE.LOG_DIR, 'peertube.log'),
-      handleExceptions: true,
-      maxsize: 1024 * 1024 * 30,
-      maxFiles: 5,
-      format: winston.format.combine(
-        winston.format.timestamp(),
-        jsonLoggerFormat
-      )
-    }),
+    new winston.transports.File(fileLoggerOptions),
     new winston.transports.Console({
       handleExceptions: true,
       format: winston.format.combine(
@@ -75,19 +98,20 @@ function bunyanLogFactory (level: string) {
     let args: any[] = []
     args.concat(arguments)
 
-    if (arguments[ 0 ] instanceof Error) {
-      meta = arguments[ 0 ].toString()
+    if (arguments[0] instanceof Error) {
+      meta = arguments[0].toString()
       args = Array.prototype.slice.call(arguments, 1)
       args.push(meta)
-    } else if (typeof (args[ 0 ]) !== 'string') {
-      meta = arguments[ 0 ]
+    } else if (typeof (args[0]) !== 'string') {
+      meta = arguments[0]
       args = Array.prototype.slice.call(arguments, 1)
       args.push(meta)
     }
 
-    logger[ level ].apply(logger, args)
+    logger[level].apply(logger, args)
   }
 }
+
 const bunyanLogger = {
   trace: bunyanLogFactory('debug'),
   debug: bunyanLogFactory('debug'),
@@ -96,13 +120,13 @@ const bunyanLogger = {
   error: bunyanLogFactory('error'),
   fatal: bunyanLogFactory('error')
 }
-
 // ---------------------------------------------------------------------------
 
 export {
   timestampFormatter,
   labelFormatter,
   consoleLoggerFormat,
+  jsonLoggerFormat,
   logger,
   bunyanLogger
 }