Merge pull request #70 from thiagobustamante/master

FIX gateway starting
TreeGateway · Oct 30, 2017 · be62fcb · be62fcb
2 parents 8a1581f + fe71633
commit be62fcb
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tree-gateway",
-  "version": "1.1.13",
+  "version": "1.1.14",
   "homepage": "http://treegateway.org",
   "description": "The Tree Gateway API Gateway",
   "author": "Thiago da Rosa de Bustamante <trbustamante@gmail.com>",

diff --git a/src/application.ts b/src/application.ts
@@ -24,7 +24,7 @@ export class Application {
             });
     }
 
-    cluster(instances: number){
+    cluster(instances: number) {
         // tslint:disable:no-console
         if (cluster.isMaster) {
             const n = instances < 1 ? os.cpus().length : instances;
@@ -59,31 +59,41 @@ export class Application {
         });
     }
 
-    private startGateway() : Promise<void> {
+    private startGateway(): Promise<void> {
         return new Promise<void>((resolve, reject) => {
             const config: Configuration = Container.get(Configuration);
-            config.on('load', () => {
-                const gateway: Gateway = Container.get(Gateway);
-                const database: Database = Container.get(Database);
-                if (gateway.running) {
-                    return resolve();
-                }
-                gateway.start()
-                    .then(() => gateway.startAdmin())
-                    .then(resolve)
-                    .catch(reject);
+            if (config.loaded) {
+                this.runGateway().then(resolve).catch(reject);
+            } else {
+                config.on('load', () => {
+                    this.runGateway().then(resolve).catch(reject);
+                });
+            }
+        });
+    }
 
-                function graceful() {
-                    gateway.stopAdmin()
-                        .then(() => gateway.stop())
-                        .then(() => database.disconnect())
-                        .then(() => process.exit(0));
-                }
+    private runGateway() {
+        return new Promise<void>((resolve, reject) => {
+            const gateway: Gateway = Container.get(Gateway);
+            const database: Database = Container.get(Database);
+            if (gateway.running) {
+                return resolve();
+            }
+            gateway.start()
+                .then(() => gateway.startAdmin())
+                .then(resolve)
+                .catch(reject);
 
-                // Stop graceful
-                process.on('SIGTERM', graceful);
-                process.on('SIGINT', graceful);
-            });
+            function graceful() {
+                gateway.stopAdmin()
+                    .then(() => gateway.stop())
+                    .then(() => database.disconnect())
+                    .then(() => process.exit(0));
+            }
+
+            // Stop graceful
+            process.on('SIGTERM', graceful);
+            process.on('SIGINT', graceful);
         });
     }
-}
+}
diff --git a/src/configuration.ts b/src/configuration.ts
@@ -193,6 +193,7 @@ export class Configuration extends EventEmitter {
                             if (!this.config.gateway.protocol) {
                                 return reject(new Error('GatewayConfig protocol is required.'));
                             }
+                            resolve();
                         } catch (e) {
                             return reject(e);
                         }

diff --git a/src/index.ts b/src/index.ts
@@ -5,4 +5,4 @@ import { Application } from './application';
 
 const app = new Application();
 
-app.start();
+app.start();