fix: should restore agent messenger first (#3658)

eggjs · Apr 29, 2019 · 04adcf9 · 04adcf9
1 parent 99eb753
commit 04adcf9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/lib/agent.js b/lib/agent.js
@@ -67,7 +67,7 @@ class Agent extends EggApplication {
           methodName, stack);
         originMethod.apply(this, arguments);
       };
-      messenger.once('egg-ready', () => {
+      messenger.prependOnceListener('egg-ready', () => {
         messenger[methodName] = originMethod;
       });
     }

diff --git a/test/fixtures/apps/boot-app/agent.js b/test/fixtures/apps/boot-app/agent.js
@@ -9,6 +9,9 @@ module.exports = class extends BaseHookClass {
     super(agent);
     agent.bootLog = [];
     assert(this.config);
+    agent.messenger.on('egg-ready', () => {
+      agent.messenger.sendToApp('agent2app');
+    });
   }
 
   configDidLoad() {

diff --git a/test/fixtures/apps/boot-app/app.js b/test/fixtures/apps/boot-app/app.js
@@ -9,6 +9,9 @@ module.exports = class extends BaseHookClass {
     super(app);
     app.bootLog = [];
     assert(this.config);
+    app.messenger.on('agent2app', () => {
+      app.messengerLog = true;
+    });
   }
 
   configDidLoad() {

diff --git a/test/lib/core/loader/load_boot.test.js b/test/lib/core/loader/load_boot.test.js
@@ -1,6 +1,8 @@
 'use strict';
 
 const assert = require('assert');
+const path = require('path');
+const { fs } = require('mz');
 const utils = require('../../../utils');
 
 describe('test/lib/core/loader/load_boot.test.js', () => {
@@ -15,6 +17,12 @@ describe('test/lib/core/loader/load_boot.test.js', () => {
     app.mockLog();
     await app.close();
     app.expectLog('app is ready');
+
+    // should restore
+    const logContent = await fs.readFile(path.join(app.config.logger.dir, 'egg-agent.log'), 'utf-8');
+    assert(!logContent.includes('agent can\'t call sendToApp before server started'));
+    assert(app.messengerLog);
+
     assert.deepStrictEqual(app.bootLog, [ 'configDidLoad',
       'didLoad',
       'willReady',