refactor (clirunner) move process termination to clirunner

 - in debug mode,  move process shutdown hooks to clirunner
 - in cloud mode, move process exit step to clirunner

Author: vengrov

lib/cli/clirunner.js

@@ -62,15 +62,23 @@ if (!program.args.length) {
 }
 
 function debug() {
-  buildOptions(true)
-    .then(CodeRunner.debug)
-    .catch(showError);
+  buildOptions(true).then((opts) => {
+    const runner = CodeRunner.debug(opts);
+
+    const handleTermination = () => {
+      logger.info('Termination signal received. Shutting down.');
+
+      runner.stop().then(() => process.exit(0));
+    };
+
+    process.on('SIGINT', handleTermination);
+    process.on('SIGTERM', handleTermination);
+  }, showError);
 }
 
 function cloud() {
   buildOptions()
     .then((opts) => {
-
       opts.driverHost = this.driverHost;
       opts.driverPort = this.driverPort;
       opts.driverRequestId = this.driverRequestId;
@@ -85,6 +93,10 @@ function cloud() {
 
       return CodeRunner.cloud(opts);
     })
+    .then(() => {
+      // force process.exit to avoid "non declared" asynchronous jobs started in business logic
+      process.exit(0);
+    })
     .catch(showError);
 }
 
@@ -100,6 +112,7 @@ function deploy() {
 
 function showError(err) {
   logger.error('Error:', err.message || err);
+  process.exit(1);
 }
 
 function assertValueIsUUID(value, name) {
@@ -120,7 +133,7 @@ function buildOptions(appIsRequired) {
   if (appIsRequired) {
     opts.app = opts.app || {};
 
-    const gatherAppOptions = async(function* () {
+    const gatherAppOptions = async(function*() {
       opts.app.id = program.appId || opts.app.id || (yield prompt('Application ID'));
       opts.app.version = program.appVersion || opts.app.version || (yield prompt('Application Version'));
       opts.app.secretKey = program.appKey || opts.app.secretKey || (yield prompt('Secret Key'));

lib/server-code/runners/cloud.js

@@ -24,17 +24,5 @@ exports.start = function(opts) {
       });
   }
 
-  function exit() {
-    // force process.exit to avoid "non declared" asynchronous jobs started in business logic
-    process.exit(0);
-  }
-
-  function logError(err) {
-    logger.error(`Error: ${err.message || err}`);
-  }
-
-  return getTask()
-    .then(processTask)
-    .catch(logError)
-    .then(exit);
+  return getTask().then(processTask);
 };

lib/server-code/runners/debug.js

@@ -63,8 +63,6 @@ class DebugCodeRunner {
   }
 
   start() {
-    this.addShutdownHook();
-
     Promise.resolve()
       .then(() => this.registerRunner())
       .then(() => this.keepDebugSessionAlive())
@@ -86,31 +84,25 @@ class DebugCodeRunner {
     return ServerCodeModel.build(process.cwd(), files);
   }
 
-  addShutdownHook() {
-    const hook = this.stop.bind(this);
-
-    process.on('exit', hook);
-    process.on('SIGINT', hook);
-    process.on('SIGTERM', hook);
-  }
-
   stop() {
     if (!this.stopped) {
-      logger.info('Shutting down Code Runner. Please wait..');
-
       if (this.sessionRenewalTimer) {
         clearTimeout(this.sessionRenewalTimer);
       }
 
+      const stopTasks = [];
+
       if (this.debugSessionId) {
-        this.apiServer.unregisterRunner();
-        this.messageBroker.del(this.debugSessionId);
+        stopTasks.push(this.apiServer.unregisterRunner());
+        stopTasks.push(this.messageBroker.del(this.debugSessionId));
       }
 
       this.taskAcquirer.quit();
       this.messageBroker.quit();
 
       this.stopped = true;
+
+      return Promise.all(stopTasks);
     }
   }
 

lib/server-code/services/api-server.js

@@ -85,8 +85,6 @@ class ApiServerService {
   }
 
   unregisterRunner() {
-    logger.info(`Unregistering runner on ${this.serverUrl}`);
-
     return this.sendRequest('unregisterRunner');
   }