@abtnode/logger 1.8.55 → 1.8.57

package/lib/logger.js

@@ -6,8 +6,9 @@ const { createLogger, format, transports } = require('winston');
 const debug = require('debug');
 const rfs = require('rotating-file-stream');
 require('winston-daily-rotate-file');
+const { LOG_RETAIN_IN_DAYS } = require('@abtnode/constant');
 const CustomRotateFileTransport = require('./transport');
-const { accessLogFilenameGenerator } = require('./util');
+const { getAccessLogFilenameGenerator } = require('./util');
 
 const instanceMap = new Map();
 
@@ -100,17 +101,22 @@ const initLogger =
         maxSize: '20m',
       };
 
+      const infoAuditFilename = `.${filename}-info.audit.json`;
+      const errorAuditFilename = `.${filename}-error.audit.json`;
+
       const infoRotateFileParams = {
         ...rotateConfig,
         filename: `${filename}-%DATE%.log`,
         ignoreLevels: ['error'],
         symlinkName: `${filename}.log`,
+        auditFile: path.join(logDir, infoAuditFilename),
       };
 
       const errorRotateFileParams = {
         ...rotateConfig,
         filename: `${filename}-error-%DATE%.log`,
         symlinkName: `${filename}-error.log`,
+        auditFile: path.join(logDir, errorAuditFilename),
         level: 'error',
       };
 
@@ -155,22 +161,59 @@ const initLogger =
 
 const getLogger = (label = '', options = {}) => {
   if (!instanceMap.has(label)) {
-    instanceMap.set(label, initLogger(label)({ retain: 60, ...options }));
+    instanceMap.set(label, initLogger(label)({ retain: LOG_RETAIN_IN_DAYS, ...options }));
   }
 
   return instanceMap.get(label);
 };
 
-const getAccessLogStream = (dir) =>
-  rfs.createStream(accessLogFilenameGenerator, {
+const deleteOldLogfiles = (file, retain) => {
+  if (typeof retain !== 'number') {
+    return;
+  }
+
+  if (file === '/dev/null') {
+    return;
+  }
+
+  const extname = path.extname(file);
+  const fileBaseName = `${path.basename(file, extname)}`;
+  const dirName = path.dirname(file);
+  const files = fs.readdirSync(dirName);
+  let i;
+  let len;
+  const rotatedFiles = [];
+  for (i = 0, len = files.length; i < len; i++) {
+    if (files[i].startsWith(`${fileBaseName}-`)) {
+      rotatedFiles.push(files[i]);
+    }
+  }
+
+  rotatedFiles.sort().reverse();
+
+  for (i = rotatedFiles.length - 1; i >= retain; i--) {
+    fs.unlinkSync(path.resolve(dirName, rotatedFiles[i]));
+  }
+};
+
+const getAccessLogStream = (dir, filename = 'access.log') => {
+  const stream = rfs.createStream(getAccessLogFilenameGenerator(filename), {
     interval: '1d',
     path: dir,
     compress: 'gzip',
   });
 
+  stream.on('rotated', () => {
+    deleteOldLogfiles(path.join(dir, filename), LOG_RETAIN_IN_DAYS);
+  });
+
+  return stream;
+};
+
 module.exports = getLogger;
 module.exports.initLogger = initLogger;
 module.exports.getNoopLogger = getNoopLogger;
 module.exports.customPrintfCallback = customPrintfCallback;
 module.exports.getInstanceSize = () => instanceMap.size;
 module.exports.getAccessLogStream = getAccessLogStream;
+module.exports.deleteOldLogfiles = deleteOldLogfiles;

package/lib/util.js

@@ -1,3 +1,5 @@
+const path = require('path');
+
 const getPreDate = (date) => {
   date.setDate(date.getDate() - 1);
 
@@ -8,23 +10,31 @@ const getPreDate = (date) => {
   return { year, month, day };
 };
 
-const accessLogFilenameGenerator = (time, index) => {
+const getAccessLogFilenameGenerator = (filename) => (time, index) => {
+  let tempFilename = filename || 'access.log';
+
+  if (path.extname(tempFilename) !== '.log') {
+    tempFilename = `${tempFilename}.log`;
+  }
+
   if (!time) {
-    return 'access.log';
+    return tempFilename;
   }
 
   const { year, month, day } = getPreDate(time);
 
-  let filename = `access-${year}-${month}-${day}`;
+  const nameWithoutExtension = path.basename(tempFilename, '.log');
+
+  let finalName = `${nameWithoutExtension}-${year}-${month}-${day}`;
 
   if (index > 1) {
-    filename = `${filename}-${index}`;
+    finalName = `${finalName}-${index}`;
   }
 
-  return `${filename}.log.gz`;
+  return `${finalName}.log.gz`;
 };
 
 module.exports = {
   getPreDate,
-  accessLogFilenameGenerator,
+  getAccessLogFilenameGenerator,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/logger",
-  "version": "1.8.55",
+  "version": "1.8.57",
   "description": "ABT Node logger lib",
   "keywords": [
     "logger",
@@ -34,6 +34,7 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
+    "@abtnode/constant": "1.8.57",
     "debug": "^4.3.4",
     "fast-safe-stringify": "^2.1.1",
     "fs-extra": "^10.1.0",
@@ -46,5 +47,5 @@
   "devDependencies": {
     "express": "^4.18.2"
   },
-  "gitHead": "dce39bef7062b76648998b1f1b9a3c0a9b708dff"
+  "gitHead": "2573eb9370c79853cba88cba418a964fb1cc8949"
 }