feat: add time duration for dump config (#2485)

eggjs · May 3, 2018 · 824200c · 824200c
1 parent 73dac08
commit 824200c
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 2 deletions.
diff --git a/config/config.default.js b/config/config.default.js
@@ -318,6 +318,7 @@ module.exports = appInfo => {
    * @property {Number} responseTimeout - response timeout, default is 60000
    */
   config.clusterClient = {
+    maxWaitTime: 60000,
     responseTimeout: 60000,
   };
 

diff --git a/lib/agent.js b/lib/agent.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+const ms = require('ms');
 const EggApplication = require('./egg');
 const AgentWorkerLoader = require('./loader').AgentWorkerLoader;
 
@@ -25,7 +26,9 @@ class Agent extends EggApplication {
     this.loader.load();
 
     // dump config after loaded, ensure all the dynamic modifications will be recorded
+    const dumpStartTime = Date.now();
     this.dumpConfig();
+    this.coreLogger.info('[egg:core] dump config after load, %s', ms(Date.now() - dumpStartTime));
 
     // keep agent alive even it don't have any io tasks
     setInterval(() => {}, 24 * 60 * 60 * 1000);

diff --git a/lib/application.js b/lib/application.js
@@ -2,6 +2,7 @@
 
 const path = require('path');
 const fs = require('fs');
+const ms = require('ms');
 const graceful = require('graceful');
 const http = require('http');
 const cluster = require('cluster-client');
@@ -69,7 +70,10 @@ class Application extends EggApplication {
     }
 
     // dump config after loaded, ensure all the dynamic modifications will be recorded
+    const dumpStartTime = Date.now();
     this.dumpConfig();
+    this.coreLogger.info('[egg:core] dump config after load, %s', ms(Date.now() - dumpStartTime));
+
     this[WARN_CONFUSED_CONFIG]();
     this[BIND_EVENTS]();
   }

diff --git a/lib/egg.js b/lib/egg.js
@@ -2,6 +2,7 @@
 
 const path = require('path');
 const fs = require('fs');
+const ms = require('ms');
 const EggCore = require('egg-core').EggCore;
 const cluster = require('cluster-client');
 const extend = require('extend2');
@@ -57,7 +58,11 @@ class EggApplication extends EggCore {
 
     // dump config after ready, ensure all the modifications during start will be recorded
     // make sure dumpConfig is the last ready callback
-    this.ready(() => process.nextTick(() => this.dumpConfig()));
+    this.ready(() => process.nextTick(() => {
+      const dumpStartTime = Date.now();
+      this.dumpConfig();
+      this.coreLogger.info('[egg:core] dump config after ready, %s', ms(Date.now() - dumpStartTime));
+    }));
     this._setupTimeoutTimer();
 
     this.console.info('[egg:core] App root: %s', this.baseDir);

diff --git a/test/lib/cluster/app_worker.test.js b/test/lib/cluster/app_worker.test.js
@@ -78,7 +78,7 @@ describe('test/lib/cluster/app_worker.test.js', () => {
         version[0] > 9) {
         html = new RegExp(
           'GET /foo bar HTTP/1.1\r\nHost: 127.0.0.1:\\d+\r\nAccept-Encoding: gzip, ' +
-          'deflate\r\nUser-Agent: node-superagent/3.8.2\r\nConnection: close\r\n\r\n');
+          'deflate\r\nUser-Agent: node-superagent/\\d+\\.\\d+\\.\\d+\r\nConnection: close\r\n\r\n');
       }
 
       // customized client error response

diff --git a/test/lib/egg.test.js b/test/lib/egg.test.js
@@ -97,6 +97,18 @@ describe('test/lib/egg.test.js', () => {
       });
       app.dumpConfig();
     });
+
+    it('should has log', () => {
+      const eggLogPath = utils.getFilepath('apps/demo/logs/demo/egg-web.log');
+      let content = fs.readFileSync(eggLogPath, 'utf8');
+      assert(/\[egg:core] dump config after load, \d+ms/.test(content));
+      assert(/\[egg:core] dump config after ready, \d+ms/.test(content));
+
+      const agentLogPath = utils.getFilepath('apps/demo/logs/demo/egg-agent.log');
+      content = fs.readFileSync(agentLogPath, 'utf8');
+      assert(/\[egg:core] dump config after load, \d+ms/.test(content));
+      assert(/\[egg:core] dump config after ready, \d+ms/.test(content));
+    });
   });
 
   describe('dumpConfig() dynamically', () => {