Fix reload bug

Makefile

@@ -53,6 +53,7 @@ prepare-test: parser
 	@cd example-apps && tar cfz socket-app_1.0.0_2.tgz socket-app_1.0.0_2/
 	@cd example-apps && tar cfz https-app.tgz https-app/
 	@cd example-apps && tar cfz exception-retry-app.tgz exception-retry-app/
+	@cd example-apps && tar cfz reload-app_1.0.0_1.tgz reload-app_1.0.0_1/
 	@cd example-apps && tar cfz java-app.tgz java-app/
 
 test: eslint prepare-test

example-apps/reload-app_1.0.0_1/index.js

@@ -0,0 +1,20 @@
+'use strict';
+
+let http = require('http');
+let path = require('path');
+let serverConfig = JSON.parse(process.env.HC_APP_CONFIG);
+
+let serv = http.createServer(function (req, res) {
+  res.setHeader('content-type', 'application/json');
+  res.end(JSON.stringify(serverConfig.config));
+});
+
+exports.run = function (cb) {
+  let sock = serverConfig.targetSock;
+  serv.listen(sock);
+  cb(null, {
+    bind: '6001',
+    router: '/reload-app',
+    target: sock
+  });
+};

example-apps/reload-app_1.0.0_1/package.json

@@ -0,0 +1,8 @@
+{
+  "main": "index.js",
+  "version": "1.0.0",
+  "buildNum": "1",
+  "honeycomb": {
+    "processorNum": 1
+  }
+}

example-apps/simple-app_1.1.0_1/index.js

@@ -8,6 +8,8 @@ let serv = http.createServer(function (req, res) {
   res.end('simple-app_v1.1.0_1');
 });
 
+console.log(serverConfig.config);
+
 exports.run = function (cb) {
   let sock = serverConfig.targetSock || path.join(__dirname, '../../simple-app_v1.1.0_1.sock');
   serv.listen(sock);

lib/child.js

@@ -30,6 +30,7 @@ class Child extends EventEmitter {
       processorNum: 1,
       exitWhenTimeout: true,
       timeout: 60000,
+      name: appInfo.name,
       version: appInfo.version,
       buildNum: appInfo.buildNum,
       weight: utils.genWeight(appInfo.version, appInfo.buildNum)
@@ -262,15 +263,17 @@ class Child extends EventEmitter {
           if (err) {
             log.error(FLAG_CHILD, `app_reload_failed : ${this.appId}`, err);
             let workers = this.workers;
-            this.cleanWorkers(workers, () => {});
+            this.cleanWorkers(workers, () => {
+              this.status = 'online';
+            });
             this.workers = this.oldWorkers;
             this.oldWorkers = {};
-            this.status = 'online';
           } else {
             log.info(FLAG_CHILD, `app_reload_success : ${this.appId} , now stop old workers`);
-            this.cleanWorkers(this.oldWorkers, () => {});
+            this.cleanWorkers(this.oldWorkers, () => {
+              this.status = 'online';
+            });
             this.oldWorkers = {};
-            this.status = 'online';
           }
         });
       });

lib/master.js

@@ -564,7 +564,7 @@ Master.prototype.$reload = function (appId, cb) {
     processorNum = privateConfig.honeycomb.processorNum || processorNum;
   }
 
-  child.options.config = this.getAppConfig(child.options.name);
+  child.options.config = privateConfig;
   child.options.processorNum = child.options.config.processorNum || processorNum;
   child.reload((err, done) => {
     if (err) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "honeycomb-server",
   "version": "1.0.9",
-  "build": "5",
+  "build": "6",
   "description": "Honeycomb, the micro-app's container",
   "repository": {
     "type": "git",

test/lib/admin/api_config.test.js

@@ -89,12 +89,44 @@ describe('api_config.test.js', () => {
 
   });
 
-  it.skip('should affect app when common config changed and app reloaded', () => {
-
+  it('should affect app when common config changed and app reloaded', (done) => {
+    common.publishApp(agent, ips, path.join(appsPkgBase, 'reload-app_1.0.0_1.tgz'))
+      .expect(200)
+      .end(() => {
+        let d = new Date().getTime();
+        common.setServerConfig(agent, ips, 'common', {testCommon: d})
+          .end(() => {
+            common.reloadApp(agent, ips, 'reload-app_1.0.0_1')
+              .end(() => {
+                let ag1 = supertest('http://localhost:6001/reload-app');
+                ag1.get('/')
+                  .expect((res)=> {
+                    res.body.testCommon.should.eql(d);
+                  })
+                  .end(done);
+              });
+          });
+      });
   });
 
-  it.skip('should affect app when config changed and app reloaded', () => {
-
+  it('should affect app when config changed and app reloaded', (done) => {
+    common.publishApp(agent, ips, path.join(appsPkgBase, 'reload-app_1.0.0_1.tgz'))
+      .expect(200)
+      .end(() => {
+        let d = new Date().getTime();
+        common.setAppConfig(agent, ips, 'reload-app', {test: d})
+          .end(() => {
+            common.reloadApp(agent, ips, 'reload-app_1.0.0_1')
+              .end(() => {
+                let ag1 = supertest('http://localhost:6001/reload-app');
+                ag1.get('/')
+                  .expect((res)=> {
+                    res.body.test.should.eql(d);
+                  })
+                  .end(done);
+              });
+          });
+      });
   });
 
 });