fix: close gracefully (eggjs#419)

lib/application.js

@@ -6,13 +6,15 @@ const http = require('http');
 const EggApplication = require('./egg');
 const AppWorkerLoader = require('./loader').AppWorkerLoader;
 const util = require('./core/util');
+const cluster = require('cluster-client');
 
 const KEYS = Symbol('Application#keys');
 const HELPER = Symbol('Application#Helper');
 const LOCALS = Symbol('Application#locals');
 const LOCALS_LIST = Symbol('Application#localsList');
 const EGG_LOADER = Symbol.for('egg#loader');
 const EGG_PATH = Symbol.for('egg#eggPath');
+const CLUSTER_CLIENTS = Symbol.for('egg#clusterClients');
 
 /**
  * Singleton instance in App Worker, extend {@link EggApplication}
@@ -27,7 +29,13 @@ class Application extends EggApplication {
   constructor(options = {}) {
     options.type = 'application';
     super(options);
-    this.loader.load();
+    try {
+      this.loader.load();
+    } catch (e) {
+      // close gracefully
+      this[CLUSTER_CLIENTS].forEach(cluster.close);
+      throw e;
+    }
 
     // dump config after loaded, ensure all the dynamic modifications will be recorded
     this.dumpConfig();

lib/egg.js

@@ -343,6 +343,7 @@ class EggApplication extends EggCore {
     const create = client.create;
     client.create = (...args) => {
       const realClient = create.apply(client, args);
+      this[CLUSTER_CLIENTS].push(realClient);
 
       this.beforeClose(function* () {
         yield cluster.close(realClient);

test/fixtures/apps/cluster-client-error/app.js

@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports = app => {
+  const err = Error();
+  err.name = 'MockError';
+  throw err;
+};

test/fixtures/apps/cluster-client-error/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "cluster-client-error"
+}

test/lib/cluster/cluster-client-error.test.js

@@ -0,0 +1,33 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const assert = require('assert');
+const sleep = require('ko-sleep');
+const utils = require('../../utils');
+
+describe('test/lib/cluster/cluster-client-error.test.js', () => {
+  let app;
+  before(function* () {
+    app = utils.app('apps/cluster-client-error');
+
+    let err;
+    try {
+      yield app.ready();
+    } catch (e) {
+      err = e;
+    }
+    assert(err);
+  });
+
+  it('should close even if app throw error', () => {
+    return app.close();
+  });
+
+  it('should follower not throw error', function* () {
+    yield sleep(1000);
+    const cnt = fs.readFileSync(path.join(__dirname, '../../fixtures/apps/cluster-client-error/logs/cluster-client-error/common-error.log'), 'utf8');
+    assert(!cnt.includes('ECONNRESET'));
+  });
+
+});

test/lib/cluster/cluster-client.test.js

@@ -13,6 +13,12 @@ describe('test/lib/cluster/cluster-client.test.js', () => {
     app = utils.app('apps/cluster_mod_app', { coverage: true });
     yield app.ready();
   });
+  after(function* () {
+    yield app.close();
+    const agentInnerClient = app.agent.registryClient[innerClient];
+    assert(agentInnerClient._realClient.closed === true);
+    mm.restore();
+  });
 
   it('should publish & subscribe ok', () => {
     return request(app.callback())
@@ -33,10 +39,4 @@ describe('test/lib/cluster/cluster-client.test.js', () => {
       });
   });
 
-  after(function* () {
-    yield app.close();
-    const agentInnerClient = app.agent.registryClient[innerClient];
-    assert(agentInnerClient._realClient.closed === true);
-    mm.restore();
-  });
 });