Load app should correct and middleware should work correct (#10)

avetjs · Dec 2, 2017 · d584a41 · d584a41
1 parent db66284
commit d584a41
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/packages/avet-cluster/lib/app_worker.js b/packages/avet-cluster/lib/app_worker.js
@@ -21,16 +21,9 @@ const listenConfig = clusterConfig.listen || /* istanbul ignore next */ {};
 const port = (options.port = options.port || listenConfig.port);
 process.send({ to: 'master', action: 'realport', data: port });
 
-app.ready(async err => {
-  if (err) {
-    console.error(err);
-    console.error('[app_worker] start error, exiting with code:1');
-    process.exit(1);
-  }
-
-  const avetServer = new AvetServer(avetOptions);
-  await avetServer.prepare();
+const avetServer = new AvetServer(avetOptions);
 
+avetServer.prepare().then(() => {
   app.use(function*(next) {
     yield avetServer.run(this, next);
 
@@ -39,7 +32,7 @@ app.ready(async err => {
     }
   });
 
-  startServer();
+  app.ready(startServer);
 });
 
 // exit if worker start timeout
@@ -49,7 +42,12 @@ function startTimeoutHandler() {
   process.exit(1);
 }
 
-function startServer() {
+function startServer(err) {
+  if (err) {
+    console.error(err);
+    console.error('[app_worker] start error, exiting with code:1');
+    process.exit(1);
+  }
   app.removeListener('startTimeout', startTimeoutHandler);
 
   let server;

diff --git a/packages/avet-core/lib/avet.js b/packages/avet-core/lib/avet.js
@@ -42,7 +42,6 @@ class AvetCore extends KoaApplication {
     );
 
     this._options = options;
-    this.middleware = [];
 
     const Loader = this[AVET_LOADER];
     this.loader = new Loader({

diff --git a/packages/avet/lib/agent.js b/packages/avet/lib/agent.js
@@ -16,7 +16,7 @@ class Agent extends AvetCore {
 
     this.loader.loadPlugin();
     this.loader.loadConfig();
-    this.loader.loadCustomApp();
+    this.loader.loadCustomAgent();
     this.loader.loadExtend();
 
     // keep agent alive even it don't have any io tasks
@@ -59,6 +59,7 @@ class Agent extends AvetCore {
           .split('\n')
           .slice(1)
           .join('\n');
+
         console.warn(
           "agent can't call %s before server started\n%s",
           methodName,

diff --git a/packages/avet/lib/avet.js b/packages/avet/lib/avet.js
@@ -14,7 +14,7 @@ class Application extends AvetCore {
 
     this.loader.loadPlugin();
     this.loader.loadConfig();
-    this.loader.loadCustomAgent();
+    this.loader.loadCustomApp();
     this.loader.loadExtend();
 
     // Listen the error that promise had not catch, then log it in common-error