use wildcard match log files

Author: zidong.pei

lib/orders/error_log.js

@@ -3,6 +3,8 @@
 var fs = require('fs');
 var helper = require('../utils');
 var Parser = require('../error_parser');
+const { promisify } = require('util');
+var glob = promisify(require('glob'));
 
 var MAX_ERROR_COUNT = 20; // 一次最多抓获20个Error
 exports.logs = []; // 日志路径
@@ -11,8 +13,10 @@ var keyMap = new Map(); // 记录每个key实际对应的路径值
 var map = new Map(); // 记录每个文件访问的位置
 var parsers = new Map(); // 每个key都有一个parser
 
-var getRealPath = function (filepath) {
-  return helper.resolveYYYYMMDDHH(filepath);
+var getRealPath =  async function (filepath) {
+  var files = await glob(filepath)
+  return files.map(path => helper.resolveYYYYMMDDHH(path))
+  
 };
 
 var readFile = function (key, filepath, callback) {
@@ -62,20 +66,26 @@ var readFile = function (key, filepath, callback) {
   });
 };
 
-var readLog = function (key, callback) {
-  var currentPath = getRealPath(key);
-  var current = keyMap.get(key);
+var readLog = async function (key, callback) {
+  var currentPaths = await getRealPath(key);
+  var currents = keyMap.get(key);
 
-  if (currentPath !== current) {
+  if (currentPaths.toString() !== currents.toString()) {
     keyMap.set(key, currentPath); // replace real path
-    readFile(key, current, function (err) {
-      if (err) {
-        return callback(err);
-      }
-      readFile(key, currentPath, callback);
-    });
+    currents.forEach(current => {
+      readFile(key, current, function (err) {
+        if (err) {
+          return callback(err);
+        }
+        currentPaths.forEach(path => {
+          readFile(key, path, callback);
+        })
+      });
+    })
   } else {
-    readFile(key, currentPath, callback);
+    currentPaths.forEach(path => {
+      readFile(key, path, callback);
+    })
   }
 };
 
@@ -94,18 +104,20 @@ var readLogs = function (callback) {
   }
 };
 
-exports.init = function (config) {
+exports.init = async function (config) {
   if (config.error_log) {
     exports.logs = config.error_log;
     var logs = config.error_log;
 
     for (var i = 0; i < logs.length; i++) {
       var key = logs[i];
       parsers.set(key, new Parser(MAX_ERROR_COUNT));
-      var realPath = getRealPath(key);
-      if (fs.existsSync(realPath)) {
-        map.set(realPath, fs.statSync(realPath).size);
-      }
+      var realPath = await getRealPath(key);
+      realPath.forEach(path => {
+        if (fs.existsSync(path)) {
+          map.set(path, fs.statSync(path).size);
+        }
+      })
       keyMap.set(key, realPath);
     }
   }