HTTP shutdown is now setup in config not in startModule

colopl · Oct 12, 2018 · eea1668 · eea1668
1 parent c5696cc
commit eea1668
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gracenode",
   "description": "A node.js framework for real-time applications over UDP and TCP protocols with extendable modules for quick and clean evelopment.",
-  "version": "3.9.20",
+  "version": "3.9.21",
   "author": "Nobuyori Takahashi <[email protected]>",
   "repository": {
     "type": "git",

diff --git a/src/http/index.js b/src/http/index.js
@@ -37,6 +37,24 @@ exports.config = function __httpConfig(configIn) {
     route.setup();
     request.setup();
     response.setup();
+    gn.onExit(function HTTPShutdown(next) {
+        try {
+            logger.info('Stopping HTTP server...');
+            server.close();
+            logger.info(
+                'HTTP server stopped gracefully:',
+                config.host + ':' + config.port
+            );
+            next();
+        } catch (e) {
+            if (e.message === 'Not running') {
+                logger.verbose(e.message);
+                return next();
+            }
+            logger.error('HTTP server error on stop:', e);
+            next(e);
+        }
+    });
 };
 
 exports.info = function __httpInfo() {
@@ -151,24 +169,6 @@ exports.startModule = function (cb) {
         );
         cb(error);
     });
-    gn.onExit(function __httpOnExit(next) {
-        try {
-            logger.info('Stopping HTTP server...');
-            server.close();
-            logger.info(
-                'HTTP server stopped gracefully:',
-                config.host + ':' + config.port
-            );
-            next();
-        } catch (e) {
-            if (e.message === 'Not running') {
-                logger.verbose(e.message);
-                return next();
-            }
-            logger.error('HTTP server error on stop:', e);
-            next(e);
-        }
-    });
     try {
         server.listen(config.port, config.host);
     } catch (error) {