fix(cli-plugin-deploy-components): send "stack-deploy-end" event on C…

…trl+C
webiny · Jul 7, 2020 · 3feb6e3 · 3feb6e3
1 parent ffa453a
commit 3feb6e3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/packages/cli-plugin-deploy-components/execute/Context.js b/packages/cli-plugin-deploy-components/execute/Context.js
@@ -10,7 +10,7 @@ const randomId = () =>
         .substring(6);
 
 class Context {
-    constructor(config) {
+    constructor(config, context) {
         this.logger = config.logger;
         this.stackName = config.stackName;
         this.stateRoot = config.stateRoot;
@@ -23,9 +23,8 @@ class Context {
         this.projectName = config.projectName;
 
         // Control + C
-        process.on("SIGINT", async () => {
+        context.onExit(() => {
             this._status.stop("cancel");
-            process.exit(1);
         });
 
         this._status = new Status();

diff --git a/packages/cli-plugin-deploy-components/execute/Status.js b/packages/cli-plugin-deploy-components/execute/Status.js
@@ -40,8 +40,6 @@ class Status {
 
     stop(reason) {
         if (!this.isRunning()) {
-            console.log();
-            process.exit(0);
             return;
         }
 
@@ -64,12 +62,6 @@ class Status {
         console.log(os.EOL);
         process.stdout.write(ansiEscapes.cursorLeft);
         process.stdout.write(ansiEscapes.cursorShow);
-
-        if (reason === "error") {
-            process.exit(1);
-        } else {
-            process.exit(0);
-        }
     }
 
     async render(status) {

diff --git a/packages/cli-plugin-deploy-components/execute/index.js b/packages/cli-plugin-deploy-components/execute/index.js
@@ -28,7 +28,7 @@ module.exports.execute = async (inputs, method, context) => {
         stackName: `${context.projectName}_${stack}`,
         env,
         debug
-    });
+    }, context);
     componentContext.projectName = context.projectName;
     await componentContext.init();
 

diff --git a/packages/cli-plugin-deploy-components/execute/template/index.js b/packages/cli-plugin-deploy-components/execute/template/index.js
@@ -63,9 +63,20 @@ class Template extends Component {
         return await this.deployAll({ ...inputs, template }, context);
     }
 
-    async deployAll(inputs = {}) {
+    async deployAll(inputs = {}, cliContext) {
         this.context.status("Deploying");
 
+        cliContext.onExit(async code => {
+            if (code === "SIGINT") {
+                await sendEvent({
+                    event: "stack-deploy-end",
+                    data: {
+                        stack: inputs.stack
+                    }
+                });
+            }
+        });
+
         await sendEvent({
             event: "stack-deploy-start",
             data: {