@abtnode/logger 1.7.7 → 1.7.10

package/lib/logger.js

@@ -3,8 +3,10 @@ const path = require('path');
 const isEmpty = require('lodash.isempty');
 const { createLogger, format, transports } = require('winston');
 const debug = require('debug');
+const rfs = require('rotating-file-stream');
 require('winston-daily-rotate-file');
 const CustomRotateFileTransport = require('./transport');
+const { accessLogFilenameGenerator } = require('./util');
 
 const instanceMap = new Map();
 
@@ -34,24 +36,29 @@ const getNoopLogger = (label = '') => {
 // singleton per process
 let addedRejectionExceptionTransport = false;
 
-const customPrintfCallback = ({ level, message, label, timestamp, metadata }) => {
+const customPrintfCallback = ({ level, message, label, timestamp, metadata, [Symbol.for('splat')]: splat }) => {
   let result = `[${process.pid}] [${timestamp}] [${level}]`;
   if (label) {
     result = `${result} [${label}]`;
   }
 
   if (!isEmpty(message)) {
-    result = `${result} "${message}"`;
+    result = `${result} [${message}]`;
   }
 
-  if (!isEmpty(metadata)) {
-    if (metadata.error && metadata.error instanceof Error) {
-      const { error } = metadata;
-      metadata.error = error.message;
-      metadata.error_stack = error.stack;
+  let newMetaData = metadata;
+  if (isEmpty(newMetaData) && !isEmpty(splat)) {
+    newMetaData = { data: splat[0] };
+  }
+
+  if (!isEmpty(newMetaData)) {
+    if (newMetaData.error && newMetaData.error instanceof Error) {
+      const { error } = newMetaData;
+      newMetaData.error = error.message;
+      newMetaData.error_stack = error.stack;
     }
 
-    result = `${result} ${JSON.stringify(metadata)}`;
+    result = `${result} ${JSON.stringify(newMetaData)}`;
   }
 
   return result;
@@ -59,7 +66,12 @@ const customPrintfCallback = ({ level, message, label, timestamp, metadata }) =>
 
 const initLogger =
   (label = '') =>
-  ({ logDir = process.env.ABT_NODE_LOG_DIR, filename = 'daemon', retain } = {}) => {
+  ({
+    logDir = process.env.ABT_NODE_LOG_DIR,
+    filename = 'daemon',
+    retain,
+    level = process.env.ABT_NODE_LOG_LEVEL,
+  } = {}) => {
     if (!logDir) {
       return getNoopLogger(label);
     }
@@ -68,14 +80,13 @@ const initLogger =
       format: format.combine(
         format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
         format.label({ label }),
-        format.splat(),
         format.metadata({ fillExcept: ['message', 'level', 'timestamp', 'label'] }),
         format.printf(customPrintfCallback)
       ),
     });
 
     if (process.env.NODE_ENV === 'production') {
-      logger.level = process.env.ABT_NODE_LOG_LEVEL || 'info';
+      logger.level = level || 'info';
       if (!fs.existsSync(logDir)) {
         fs.mkdirSync(logDir, { recursive: true });
       }
@@ -126,7 +137,7 @@ const initLogger =
         addedRejectionExceptionTransport = true;
       }
     } else {
-      logger.level = process.env.ABT_NODE_LOG_LEVEL || 'debug';
+      logger.level = level || 'debug';
       const transport = new transports.Console();
 
       logger.add(transport);
@@ -149,8 +160,16 @@ const getLogger = (label = '', options = {}) => {
   return instanceMap.get(label);
 };
 
+const getAccessLogStream = (dir) =>
+  rfs.createStream(accessLogFilenameGenerator, {
+    interval: '1d',
+    path: dir,
+    compress: 'gzip',
+  });
+
 module.exports = getLogger;
 module.exports.initLogger = initLogger;
 module.exports.getNoopLogger = getNoopLogger;
 module.exports.customPrintfCallback = customPrintfCallback;
 module.exports.getInstanceSize = () => instanceMap.size;
+module.exports.getAccessLogStream = getAccessLogStream;

package/lib/util.js

@@ -0,0 +1,30 @@
+const getPreDate = (date) => {
+  date.setDate(date.getDate() - 1);
+
+  const year = date.getFullYear().toString();
+  const month = (date.getMonth() + 1).toString().padStart(2, 0);
+  const day = date.getDate().toString().padStart(2, 0);
+
+  return { year, month, day };
+};
+
+const accessLogFilenameGenerator = (time, index) => {
+  if (!time) {
+    return 'access.log';
+  }
+
+  const { year, month, day } = getPreDate(time);
+
+  let filename = `access-${year}-${month}-${day}`;
+
+  if (index > 1) {
+    filename = `${filename}-${index}`;
+  }
+
+  return `${filename}.log.gz`;
+};
+
+module.exports = {
+  getPreDate,
+  accessLogFilenameGenerator,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/logger",
-  "version": "1.7.7",
+  "version": "1.7.10",
   "description": "ABT Node logger lib",
   "keywords": [
     "logger",
@@ -38,11 +38,12 @@
     "fs-extra": "^10.0.1",
     "lodash.isempty": "^4.4.0",
     "rewire": "^5.0.0",
+    "rotating-file-stream": "^2.1.6",
     "winston": "^3.3.4",
     "winston-daily-rotate-file": "^4.5.5"
   },
   "devDependencies": {
     "express": "^4.17.1"
   },
-  "gitHead": "619db37ea7a91c64a9bf30836a55c70d55325e73"
+  "gitHead": "8eab10fd39b6183a2fa4d2706f52e8b2ecaa059a"
 }