cgserver 10.2.6 → 10.4.0

package/dist/lib/Framework/Config/FrameworkConfig.js

@@ -150,26 +150,18 @@ class FrameworkConfig extends Config_1.Config {
                 appenders: ['console'],
                 level: 'ALL'
             },
-            log_file: {
+            logger: {
                 appenders: ['log_file'],
                 level: 'ALL'
             },
-            log_date: {
-                appenders: ['log_date'],
-                level: 'ALL'
-            },
-            client_log_file: {
+            client_logger: {
                 appenders: ['client_log_file'],
                 level: 'ALL'
             },
-            client_log_date: {
-                appenders: ['client_log_date'],
-                level: 'ALL'
-            },
-            error_log_file: {
+            error_logger: {
                 appenders: ['error_log_file'],
                 level: 'ALL'
-            },
+            }
         }
     };
     db = new DbConfig_1.DbConfig();

package/dist/lib/Framework/Logic/Log.js

@@ -24,7 +24,7 @@ class Log {
     //the log from client
     _client_logger = null;
     //error and warn
-    _errorLogger = null;
+    _error_logger = null;
     _inited = false;
     /**
      * 该level只是用来控制控制台的显示的
@@ -42,14 +42,14 @@ class Log {
         }
         colors.enable();
         log4js.configure(cfg);
-        if (cfg.categories.default.appenders[0]) {
-            this._logger = log4js.getLogger(cfg.categories.default.appenders[0]);
+        if (cfg.categories.logger && cfg.categories.logger.appenders.length > 0) {
+            this._logger = log4js.getLogger(cfg.categories.logger.appenders[0]);
         }
-        if (cfg.categories.client_log_file.appenders[0]) {
-            this._client_logger = log4js.getLogger(cfg.categories.client_log_file.appenders[0]);
+        if (cfg.categories.client_logger && cfg.categories.client_logger.appenders.length > 0) {
+            this._client_logger = log4js.getLogger(cfg.categories.client_logger.appenders[0]);
         }
-        if (cfg.categories.error_log_file.appenders[0]) {
-            this._errorLogger = log4js.getLogger(cfg.categories.error_log_file.appenders[0]);
+        if (cfg.categories.error_logger && cfg.categories.error_logger.appenders.length > 0) {
+            this._error_logger = log4js.getLogger(cfg.categories.error_logger.appenders[0]);
         }
     }
     _convertMsg(message) {
@@ -65,7 +65,7 @@ class Log {
     }
     error(message) {
         message = this._convertMsg(message);
-        this._errorLogger?.error(message);
+        this._error_logger?.error(message);
         if (this._console_level >= 0) {
             let time_str = this._getTimeStr();
             console.error(time_str + " " + message);
@@ -81,7 +81,7 @@ class Log {
     }
     warn(message) {
         message = this._convertMsg(message);
-        this._errorLogger?.warn(message);
+        this._error_logger?.warn(message);
         if (this._console_level >= 0) {
             let time_str = this._getTimeStr();
             console.warn(time_str + " " + message);

package/dist/types/Framework/Config/FrameworkConfig.d.ts

@@ -156,23 +156,15 @@ export declare class FrameworkConfig extends Config {
                 appenders: string[];
                 level: string;
             };
-            log_file: {
-                appenders: string[];
-                level: string;
-            };
-            log_date: {
+            logger: {
                 appenders: string[];
                 level: string;
             };
-            client_log_file: {
+            client_logger: {
                 appenders: string[];
                 level: string;
             };
-            client_log_date: {
-                appenders: string[];
-                level: string;
-            };
-            error_log_file: {
+            error_logger: {
                 appenders: string[];
                 level: string;
             };

package/dist/types/Framework/Logic/Log.d.ts

@@ -2,7 +2,7 @@ import * as log4js from "log4js";
 export declare class Log {
     protected _logger: log4js.Logger;
     protected _client_logger: log4js.Logger;
-    protected _errorLogger: log4js.Logger;
+    protected _error_logger: log4js.Logger;
     protected _inited: boolean;
     /**
      * 该level只是用来控制控制台的显示的

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "10.2.6",
+  "version": "10.4.0",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",