Passing options object to loadCommands instead of bool

Author: jinpingh

Diff for: 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({exit: true});
+          stop({exitOnFailure: true});
         } else {
           throw err;
         }
@@ -206,9 +206,11 @@ module.exports = function(robot) {
   // handler to manage per adapter message post-ing.
   var postDataHandler = postData.getDataPostHandler(robot.adapterName, robot, formatter);
 
-  var loadCommands = function(exitOnFailure) {
+  var loadCommands = function(exitOpts) {
     robot.logger.info('Loading commands....');
 
+    var exitOpts = _.merge({}, {exitOnFailure: false }, exitOpts)
+
     api.actionAlias.list()
       .then(function (aliases) {
         // Remove all the existing commands
@@ -245,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 (exitOnFailure) {
-          stop({exit: true});
+        if (exitOpts.exitOnFailure) {
+          stop(exitOpts);
         }
       });
   };
@@ -420,30 +422,30 @@ module.exports = function(robot) {
     });
 
     // Initial command loading
-    loadCommands(env.EXIT_ON_FAILURES);
+    loadCommands({exitOnFailure: env.EXIT_ON_FAILURES});
+
+    // Add an interval which tries to re-load the commands
+    commands_load_interval = setInterval(loadCommands.bind(), (env.ST2_COMMANDS_RELOAD_INTERVAL * 1000));
 
     // Install SIGUSR2 handler which reloads the command
     install_sigusr2_handler();
-
-    // Add an interval which tries to re-load the commands
-    commands_load_interval = setInterval(loadCommands.bind(self, false), (env.ST2_COMMANDS_RELOAD_INTERVAL * 1000));
   }
 
-  function stop(exitFromProcess) {
+  function stop(exitOpts) {
     clearInterval(commands_load_interval);
     api.stream.listen().then(function (source) {
       source.removeAllListeners();
       source.close();
     });
 
-    if (exitFromProcess.exit) {
+    if (exitOpts.exitOnFailure) {
        process.exit(1)
     }
   }
 
   function install_sigusr2_handler() {
     process.on('SIGUSR2', function() {
-      loadCommands(false);
+      loadCommands();
     });
   }