Passing new options object to stop()

Author: jinpingh

scripts/stackstorm.js

@@ -175,7 +175,7 @@ module.exports = function(robot) {
         robot.logger.error('Failed to authenticate: ' + err.message);
 
         if (env.EXIT_ON_FAILURES) {
-          stop({exitOnFailure: true});
+          stop({exit: true});
         } else {
           throw err;
         }
@@ -206,10 +206,10 @@ module.exports = function(robot) {
   // handler to manage per adapter message post-ing.
   var postDataHandler = postData.getDataPostHandler(robot.adapterName, robot, formatter);
 
-  var loadCommands = function(exitOpts) {
+  var loadCommands = function(opts) {
     robot.logger.info('Loading commands....');
 
-    var exitOpts = _.merge({}, {exitOnFailure: false }, exitOpts)
+    var opts = _.merge({exitOnFailure: false}, opts);
 
     api.actionAlias.list()
       .then(function (aliases) {
@@ -247,8 +247,8 @@ module.exports = function(robot) {
       .catch(function (err) {
         var error_msg = 'Failed to retrieve commands from "%s": %s';
         robot.logger.error(util.format(error_msg, env.ST2_API_URL, err.message));
-        if (exitOpts.exitOnFailure) {
-          stop(exitOpts);
+        if (opts.exitOnFailure) {
+          stop({exit: true});
         }
       });
   };
@@ -431,15 +431,18 @@ module.exports = function(robot) {
     install_sigusr2_handler();
   }
 
-  function stop(exitOpts) {
+  function stop(opts) {
+    var opts = _.merge({exit: false}, opts);
+
     clearInterval(commands_load_interval);
     api.stream.listen().then(function (source) {
       source.removeAllListeners();
       source.close();
     });
 
-    if (exitOpts.exitOnFailure) {
-       process.exit(1)
+    if (opts.exit) {
+      robot.server.close();
+      robot.shutdown();
     }
   }