X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Flogger.ts;h=81b0dfaaae83b6897ff40e1fb14adc1837ac7d37;hb=62549e6c9818f422698f030e0b242609115493ed;hp=7968b5ec9904f30e35f53f511e1ac38234132d8e;hpb=05e67d6206669b4a17e786038b1923e79bacb196;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index 7968b5ec9..81b0dfaaa 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -1,97 +1,148 @@
 // Thanks http://tostring.it/2014/06/23/advanced-logging-with-nodejs/
-import * as mkdirp from 'mkdirp'
-import * as path from 'path'
-import * as winston from 'winston'
-import { CONFIG } from '../initializers'
+import { mkdirpSync, stat } from 'fs-extra'
+import { omit } from 'lodash'
+import { join } from 'path'
+import { format as sqlFormat } from 'sql-formatter'
+import { createLogger, format, transports } from 'winston'
+import { FileTransportOptions } from 'winston/lib/winston/transports'
+import { CONFIG } from '../initializers/config'
+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)
-
-// Use object for better performances (~ O(1))
-const excludedKeys = {
-  level: true,
-  message: true,
-  splat: true,
-  timestamp: true,
-  label: true
-}
-function keysExcluder (key, value) {
-  return excludedKeys[key] === true ? undefined : value
+// FIXME: use async
+mkdirpSync(CONFIG.STORAGE.LOG_DIR)
+
+function getLoggerReplacer () {
+  const seen = new WeakSet()
+
+  // Thanks: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Cyclic_object_value#Examples
+  return (key: string, value: any) => {
+    if (key === 'cert') return 'Replaced by the logger to avoid large log message'
+
+    if (typeof value === 'object' && value !== null) {
+      if (seen.has(value)) return
+
+      seen.add(value)
+    }
+
+    if (value instanceof Set) {
+      return Array.from(value)
+    }
+
+    if (value instanceof Map) {
+      return Array.from(value.entries())
+    }
+
+    if (value instanceof Error) {
+      const error = {}
+
+      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 consoleLoggerFormat = format.printf(info => {
+  const toOmit = [ 'label', 'timestamp', 'level', 'message', 'sql', 'tags' ]
+
+  const obj = omit(info, ...toOmit)
+
+  let additionalInfos = JSON.stringify(obj, getLoggerReplacer(), 2)
+
+  if (additionalInfos === undefined || additionalInfos === '{}') additionalInfos = ''
   else additionalInfos = ' ' + additionalInfos
 
-  if (info.message && info.message.stack !== undefined) info.message = info.message.stack
+  if (info.sql) {
+    if (CONFIG.LOG.PRETTIFY_SQL) {
+      additionalInfos += '\n' + sqlFormat(info.sql, {
+        language: 'sql',
+        indent: '  '
+      })
+    } else {
+      additionalInfos += ' - ' + info.sql
+    }
+  }
+
   return `[${info.label}] ${info.timestamp} ${info.level}: ${info.message}${additionalInfos}`
 })
 
-const jsonLoggerFormat = winston.format.printf(info => {
-  if (info.message && info.message.stack !== undefined) info.message = info.message.stack
-
-  return JSON.stringify(info)
+const jsonLoggerFormat = format.printf(info => {
+  return JSON.stringify(info, getLoggerReplacer())
 })
 
-const timestampFormatter = winston.format.timestamp({
+const timestampFormatter = format.timestamp({
   format: 'YYYY-MM-DD HH:mm:ss.SSS'
 })
-const labelFormatter = winston.format.label({
-  label
-})
+const labelFormatter = (suffix?: string) => {
+  return format.label({
+    label: suffix ? `${label} ${suffix}` : label
+  })
+}
 
-const logger = new winston.createLogger({
-  level: CONFIG.LOG.LEVEL,
-  transports: [
-    new winston.transports.File({
-      filename: path.join(CONFIG.STORAGE.LOG_DIR, 'peertube.log'),
-      handleExceptions: true,
-      maxsize: 5242880,
-      maxFiles: 5,
-      format: winston.format.combine(
-        winston.format.timestamp(),
-        labelFormatter,
-        winston.format.splat(),
-        jsonLoggerFormat
-      )
-    }),
-    new winston.transports.Console({
-      handleExceptions: true,
-      humanReadableUnhandledException: true,
-      format: winston.format.combine(
-        timestampFormatter,
-        winston.format.splat(),
-        labelFormatter,
-        winston.format.colorize(),
-        consoleLoggerFormat
-      )
-    })
-  ],
-  exitOnError: true
-})
+const fileLoggerOptions: FileTransportOptions = {
+  filename: join(CONFIG.STORAGE.LOG_DIR, LOG_FILENAME),
+  handleExceptions: true,
+  format: format.combine(
+    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 = buildLogger()
+
+function buildLogger (labelSuffix?: string) {
+  return createLogger({
+    level: CONFIG.LOG.LEVEL,
+    format: format.combine(
+      labelFormatter(labelSuffix),
+      format.splat()
+    ),
+    transports: [
+      new transports.File(fileLoggerOptions),
+      new transports.Console({
+        handleExceptions: true,
+        format: format.combine(
+          timestampFormatter,
+          format.colorize(),
+          consoleLoggerFormat
+        )
+      })
+    ],
+    exitOnError: true
+  })
+}
 
 function bunyanLogFactory (level: string) {
-  return function () {
+  return function (...params: any[]) {
     let meta = null
-    let args = [].concat(arguments)
+    let args = [].concat(params)
 
-    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 = {
+  level: () => { },
   trace: bunyanLogFactory('debug'),
   debug: bunyanLogFactory('debug'),
   info: bunyanLogFactory('info'),
@@ -100,12 +151,45 @@ const bunyanLogger = {
   fatal: bunyanLogFactory('error')
 }
 
+type LoggerTagsFn = (...tags: string[]) => { tags: string[] }
+function loggerTagsFactory (...defaultTags: string[]): LoggerTagsFn {
+  return (...tags: string[]) => {
+    return { tags: defaultTags.concat(tags) }
+  }
+}
+
+async function mtimeSortFilesDesc (files: string[], basePath: string) {
+  const promises = []
+  const out: { file: string, mtime: number }[] = []
+
+  for (const file of files) {
+    const p = stat(basePath + '/' + file)
+      .then(stats => {
+        if (stats.isFile()) out.push({ file, mtime: stats.mtime.getTime() })
+      })
+
+    promises.push(p)
+  }
+
+  await Promise.all(promises)
+
+  out.sort((a, b) => b.mtime - a.mtime)
+
+  return out
+}
+
 // ---------------------------------------------------------------------------
 
 export {
+  LoggerTagsFn,
+
+  buildLogger,
   timestampFormatter,
   labelFormatter,
   consoleLoggerFormat,
+  jsonLoggerFormat,
+  mtimeSortFilesDesc,
   logger,
+  loggerTagsFactory,
   bunyanLogger
 }