@abtnode/router-provider 1.8.55 → 1.8.57

package/lib/nginx/index.js

@@ -18,6 +18,7 @@ const {
   DEFAULT_ADMIN_PATH,
   SLOT_FOR_IP_DNS_SITE,
   WELLKNOWN_SERVICE_PATH_PREFIX,
+  LOG_RETAIN_IN_DAYS,
 } = require('@abtnode/constant');
 const md5 = require('@abtnode/util/lib/md5');
 
@@ -292,7 +293,7 @@ class NginxProvider extends BaseProvider {
     }
   }
 
-  async rotateLogs() {
+  async rotateLogs({ retain = LOG_RETAIN_IN_DAYS } = {}) {
     const nginxStatus = await getNginxStatus(this.configDir);
     if (!nginxStatus.managed) {
       logger.warn('nginx is not running');
@@ -302,7 +303,7 @@ class NginxProvider extends BaseProvider {
     logger.info('start rotate nginx log files');
     const files = [this.accessLog, this.errorLog];
     const rotateTasks = files.map(
-      (file) => rotateNginxLogFile({ file, nginxPid: nginxStatus.pid, cwd: this.logDir })
+      (file) => rotateNginxLogFile({ file, nginxPid: nginxStatus.pid, cwd: this.logDir, retain })
       // eslint-disable-next-line function-paren-newline
     );
     await Promise.all(rotateTasks);

package/lib/nginx/util.js

@@ -10,6 +10,7 @@ const findProcess = require('find-process');
 const moment = require('moment');
 const { MAX_UPLOAD_FILE_SIZE, MAX_NGINX_WORKER_CONNECTIONS } = require('@abtnode/constant');
 const formatBackSlash = require('@abtnode/util/lib/format-back-slash');
+const { deleteOldLogfiles } = require('@abtnode/logger');
 
 const logger = require('@abtnode/logger')('router:nginx:util');
 
@@ -230,7 +231,7 @@ const compressFile = ({ sourceFile, targetFile, options = {} }) => {
  * rotate log files: access file and access log
  * refer: https://www.nginx.com/resources/wiki/start/topics/examples/logrotation/
  */
-const rotateNginxLogFile = async ({ file, cwd, nginxPid }) => {
+const rotateNginxLogFile = async ({ file, cwd, nginxPid, retain }) => {
   const dateStr = moment().subtract(1, 'days').format('YYYY-MM-DD');
   const uncompressedTargetLogfile = path.join(cwd, `${path.basename(file, '.log')}-${dateStr}.log`);
   const targetLogfile = path.join(cwd, `${path.basename(file, '.log')}-${dateStr}.log.gz`);
@@ -259,6 +260,8 @@ const rotateNginxLogFile = async ({ file, cwd, nginxPid }) => {
       }
     }
   }
+
+  deleteOldLogfiles(file, retain);
 };
 
 const getMissingModules = (configParams) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/router-provider",
-  "version": "1.8.55",
+  "version": "1.8.57",
   "description": "Routing engine implementations for abt node",
   "author": "polunzh <polunzh@gmail.com>",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
@@ -32,10 +32,10 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.8.55",
-    "@abtnode/logger": "1.8.55",
-    "@abtnode/router-templates": "1.8.55",
-    "@abtnode/util": "1.8.55",
+    "@abtnode/constant": "1.8.57",
+    "@abtnode/logger": "1.8.57",
+    "@abtnode/router-templates": "1.8.57",
+    "@abtnode/util": "1.8.57",
     "axios": "^0.27.2",
     "debug": "^4.3.4",
     "find-process": "^1.4.7",
@@ -62,5 +62,5 @@
     "fs-extra": "^10.1.0",
     "needle": "^3.1.0"
   },
-  "gitHead": "dce39bef7062b76648998b1f1b9a3c0a9b708dff"
+  "gitHead": "2573eb9370c79853cba88cba418a964fb1cc8949"
 }