Avoids easy cheating on vidoe views

[github/Chocobozzz/PeerTube.git] / server / helpers / logger.ts

diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index 7624b3cff8b3b4b9201617668c80f4879ecba97b..a4e5b58a4e62c4985e218f916faffc082288370d 100644 (file)
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -21,17 +21,23 @@ function keysExcluder (key, value) {
   return excludedKeys[key] === true ? undefined : value
 }
 
-const loggerFormat = winston.format.printf((info) => {
+const consoleLoggerFormat = winston.format.printf(info => {
   let additionalInfos = JSON.stringify(info, keysExcluder, 2)
   if (additionalInfos === '{}') additionalInfos = ''
   else additionalInfos = ' ' + additionalInfos
 
-  if (info.message.stack !== undefined) info.message = info.message.stack
+  if (info.message && info.message.stack !== undefined) info.message = info.message.stack
   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 timestampFormatter = winston.format.timestamp({
-  format: 'YYYY-MM-DD hh:mm:ss.SSS'
+  format: 'YYYY-MM-dd HH:mm:ss.SSS'
 })
 const labelFormatter = winston.format.label({
   label
@@ -49,7 +55,7 @@ const logger = new winston.createLogger({
         timestampFormatter,
         labelFormatter,
         winston.format.splat(),
-        winston.format.json()
+        jsonLoggerFormat
       )
     }),
     new winston.transports.Console({
@@ -60,7 +66,7 @@ const logger = new winston.createLogger({
         winston.format.splat(),
         labelFormatter,
         winston.format.colorize(),
-        loggerFormat
+        consoleLoggerFormat
       )
     })
   ],
@@ -72,6 +78,6 @@ const logger = new winston.createLogger({
 export {
   timestampFormatter,
   labelFormatter,
-  loggerFormat,
+  consoleLoggerFormat,
   logger
 }