ee-core 2.10.0 → 2.10.2

package/config/index.js

@@ -1,4 +1,5 @@
 const Storage = require('../storage');
+const ConfigCache = require('./cache');
 var SystemDb = undefined;
 
 const Cfg = {
@@ -15,7 +16,12 @@ const Cfg = {
   /**
    * all
    */
-  all() {
+  all(fromCache = true) {
+    if (fromCache === true) {
+      // 如果子进程
+      const cacheValue = ConfigCache.all();
+      return cacheValue;
+    }
     const cdb = this._getCoreDB();
     const config = cdb.getItem('config');
   
@@ -45,7 +51,12 @@ const Cfg = {
   /**
    * getValue
    */
-  getValue(key) {
+  getValue(key, fromCache = true) {
+    if (fromCache === true) {
+      const cacheValue = ConfigCache.getValue(key);
+      return cacheValue;
+    }
+
     const cdb = this._getCoreDB();
     let v = cdb.getConfigItem(key);
   

package/jobs/child/app.js

@@ -5,13 +5,6 @@ const Loader = require('ee-core/loader');
 const Log = require('ee-core/log');
 const UtilsCore = require('ee-core/core/lib/utils');
 
-// 开发环境下，ee-core是soft link
-// /node_modules[\\/]electron[\\/]/.test(process.execPath)
-// const Exception = require('../../exception');
-// const Loader = require('../../loader');
-// const Log = require('../../log');
-// const UtilsCore = require('../../core/lib/utils');
-
 Exception.start();
 const commands = ['run'];
 

package/log/logger.js

@@ -4,8 +4,13 @@ const dayjs = require('dayjs');
 const path = require('path');
 const Ps = require('../ps');
 const Conf = require('../config');
-const ConfCache = require('../config/cache');
+const ConfigCache = require('../config/cache');
 let LogDate = 0;
+const TmpFileName = {
+  appLogName: '',
+  coreLogName: '',
+  errorLogName: '',
+}
 
 module.exports = {
 
@@ -39,10 +44,10 @@ module.exports = {
         customLogger: {}
       }
 
-      // 先从 cache 中读配置，如果没有从文件中读（子进程无法获取 cache）
-      let sysConfig = ConfCache.all(false);
+      // 先从 cache 中读配置且不能抛出错误，如果没有从文件中读（子进程无法获取 cache）
+      let sysConfig = ConfigCache.all(false);
       if (!sysConfig) {
-        sysConfig = Conf.all();
+        sysConfig = Conf.all(false);
       }
       opt = Object.assign(defaultConfig, {
         logger: sysConfig.logger,
@@ -73,9 +78,20 @@ module.exports = {
     let now = parseInt(dayjs().format('YYYYMMDD'));
     if (LogDate != now) {
       LogDate = now;
-      let appLogName = logOpt.logger.appLogName;
-      let coreLogName = logOpt.logger.coreLogName;
-      let errorLogName = logOpt.logger.errorLogName;
+
+      // 保存一个临时文件名，防止文件名按日期累加
+      if (TmpFileName.appLogName.length == 0) {
+        TmpFileName.appLogName = logOpt.logger.appLogName;
+      }
+      if (TmpFileName.coreLogName.length == 0) {
+        TmpFileName.coreLogName = logOpt.logger.coreLogName;
+      }
+      if (TmpFileName.errorLogName.length == 0) {
+        TmpFileName.errorLogName = logOpt.logger.errorLogName;
+      }
+      let appLogName = TmpFileName.appLogName;
+      let coreLogName = TmpFileName.coreLogName;
+      let errorLogName = TmpFileName.errorLogName;
       let appLogExtname = path.extname(appLogName);
       let coreLogExtname = path.extname(coreLogName);
       let errorLogExtname = path.extname(errorLogName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.10.0",
+  "version": "2.10.2",
   "description": "ee core",
   "main": "index.js",
   "scripts": {