chore(master): log configFrom on startup

Tencent · Nov 8, 2018 · b3c5942 · b3c5942
1 parent 69811fe
commit b3c5942
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/bin/proxy/config.js b/bin/proxy/config.js
@@ -27,19 +27,25 @@ if (global[__filename]) {
 }
 
 if (typeof processArgs.config === 'string') {
-    cache.config = require(path.resolve(cwd, processArgs.config));
+    cache.config = loadConfig(path.resolve(cwd, processArgs.config));
 } else if (typeof process.env.TSW_CONFIG_PATH === 'string') {
-    cache.config = require(process.env.TSW_CONFIG_PATH);
+    cache.config = loadConfig(process.env.TSW_CONFIG_PATH);
 } else if (fs.existsSync(currConfig)) {
-    cache.config = require(currConfig);
+    cache.config = loadConfig(currConfig);
 } else if (fs.existsSync('/etc/tsw.config.js')) {
-    cache.config = require('/etc/tsw.config.js');
+    cache.config = loadConfig('/etc/tsw.config.js');
 } else if (fs.existsSync('/usr/local/node_modules/config.js')) {
-    cache.config = require('/usr/local/node_modules/config.js');
+    cache.config = loadConfig('/usr/local/node_modules/config.js');
 } else if (fs.existsSync('/data/release/node_modules/config.js')) {
-    cache.config = require('/data/release/node_modules/config.js');
+    cache.config = loadConfig('/data/release/node_modules/config.js');
 } else if (fs.existsSync(__dirname + '/../../conf/config.js')) {
-    cache.config = require('../../conf/config.js');
+    cache.config = loadConfig(__dirname + '/../../conf/config.js');
+}
+
+function loadConfig(configFrom) {
+    const config = require(configFrom);
+    config.configFrom = configFrom;
+    return config;
 }
 
 

diff --git a/bin/proxy/master.js b/bin/proxy/master.js
@@ -106,6 +106,7 @@ function startServer() {
         }, 3000);
 
         logger.info('start master....');
+        logger.info(`config from: ${config.configFrom}`);
         logger.info('version node: ${node}, modules: ${modules}', process.versions);
 
         if (serverOS.isLinux) {
@@ -140,6 +141,7 @@ function startServer() {
 
         process.title = 'TSW/worker/node';
         logger.info('start worker....');
+        logger.info(`config from: ${config.configFrom}`);
         require('./http.proxy.js');
         require('runtime/jank.watcher.js');