Better handling of SIGINT and SIGTERM

glhd · Feb 5, 2019 · b03d1b3 · b03d1b3
1 parent 6d71401
commit b03d1b3
Show file tree

Hide file tree

Showing 6 changed files with 106 additions and 30 deletions.
diff --git a/dist/ansible-interactive.js b/dist/ansible-interactive.js
@@ -24463,14 +24463,42 @@ async function execute(command) {
 			env: process$1.env,
 			encoding: "utf8",
 			shell: true,
+			detached: false,
 			stdio: "inherit"
 		};
 
 		const binary = command.shift();
 		const proc = spawn$1(binary, command, opts);
+
+		const interrupt = () => proc.kill('SIGINT');
+		const terminate = () => proc.kill('SIGTERM');
+
+		process$1.on('SIGINT', interrupt);
+		process$1.on('SIGTERM', terminate);
+
+		const cleanup = () => {
+			process$1.off('SIGINT', interrupt);
+			process$1.off('SIGTERM', terminate);
+		};
 
-		proc.on('exit', resolve);
-		proc.on('error', reject);
+		proc.on('exit', (code) => {
+			cleanup();
+
+			if (0 === code) {
+				resolve(code);
+			} else {
+				reject(`Ansible exited with code ${code}`);
+			}
+		});
+
+		proc.on('error', (err) => {
+			if (proc.connected) {
+				proc.kill();
+			}
+
+			cleanup();
+			reject(err);
+		});
 	});
 }
 
@@ -24480,21 +24508,18 @@ var runCommand = async function(command) {
 	await confirm$1(command_line);
 	await saveHistory$1(command);
 
-	try {
-		await execute(command);
-		console.log('');
-		process$1.exit(0);
-	} catch (e) {
-		console.log('');
-		process$1.exit(1);
-	}
+	await execute(command);
+
+	console.log('');
+	process$1.exit(0);
 };
 
 var ansibleInteractive = async function() {
 	try {
 		const replay_command = await replay();
 		if (replay_command) {
 			await runCommand(replay_command); // FIXME
+			return;
 		}
 
 		const inventory = await loadInventory(args_1.inventory);

diff --git a/dist/bin/ansible-interactive b/dist/bin/ansible-interactive
diff --git a/dist/js/ansible-interactive b/dist/js/ansible-interactive
@@ -24464,14 +24464,42 @@ async function execute(command) {
 			env: process$1.env,
 			encoding: "utf8",
 			shell: true,
+			detached: false,
 			stdio: "inherit"
 		};
 
 		const binary = command.shift();
 		const proc = spawn$1(binary, command, opts);
+
+		const interrupt = () => proc.kill('SIGINT');
+		const terminate = () => proc.kill('SIGTERM');
+
+		process$1.on('SIGINT', interrupt);
+		process$1.on('SIGTERM', terminate);
+
+		const cleanup = () => {
+			process$1.off('SIGINT', interrupt);
+			process$1.off('SIGTERM', terminate);
+		};
 
-		proc.on('exit', resolve);
-		proc.on('error', reject);
+		proc.on('exit', (code) => {
+			cleanup();
+
+			if (0 === code) {
+				resolve(code);
+			} else {
+				reject(`Ansible exited with code ${code}`);
+			}
+		});
+
+		proc.on('error', (err) => {
+			if (proc.connected) {
+				proc.kill();
+			}
+
+			cleanup();
+			reject(err);
+		});
 	});
 }
 
@@ -24481,21 +24509,18 @@ var runCommand = async function(command) {
 	await confirm$1(command_line);
 	await saveHistory$1(command);
 
-	try {
-		await execute(command);
-		console.log('');
-		process$1.exit(0);
-	} catch (e) {
-		console.log('');
-		process$1.exit(1);
-	}
+	await execute(command);
+
+	console.log('');
+	process$1.exit(0);
 };
 
 var ansibleInteractive = async function() {
 	try {
 		const replay_command = await replay();
 		if (replay_command) {
 			await runCommand(replay_command); // FIXME
+			return;
 		}
 
 		const inventory = await loadInventory(args_1.inventory);

diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
     "make-dist-dirs": "mkdir -p dist/js && mkdir -p dist/bin",
     "dist-js": "echo '#!/usr/bin/env node' | cat - dist/ansible-interactive.js > dist/js/ansible-interactive && chmod +x dist/js/ansible-interactive",
     "dist-bin": "nexe -i dist/ansible-interactive.js -o dist/bin/ansible-interactive",
+    "dist-bin-fresh": "nexe --build -i dist/ansible-interactive.js -o dist/bin/ansible-interactive",
     "dist": "yarn run clean-dist && yarn run make-dist-dirs && yarn run build && yarn run dist-js"
   }
 }
diff --git a/src/ansible-interactive.js b/src/ansible-interactive.js
@@ -17,6 +17,7 @@ module.exports = async function() {
 		const replay_command = await replay();
 		if (replay_command) {
 			await runCommand(replay_command); // FIXME
+			return;
 		}
 
 		const inventory = await loadInventory(args.inventory);

diff --git a/src/run-command.js b/src/run-command.js
@@ -39,14 +39,42 @@ async function execute(command) {
 			env: process.env,
 			encoding: "utf8",
 			shell: true,
+			detached: false,
 			stdio: "inherit"
 		};
 
 		const binary = command.shift();
 		const proc = spawn(binary, command, opts);
+
+		const interrupt = () => proc.kill('SIGINT');
+		const terminate = () => proc.kill('SIGTERM');
+
+		process.on('SIGINT', interrupt);
+		process.on('SIGTERM', terminate);
+
+		const cleanup = () => {
+			process.off('SIGINT', interrupt);
+			process.off('SIGTERM', terminate);
+		};
 
-		proc.on('exit', resolve);
-		proc.on('error', reject);
+		proc.on('exit', (code) => {
+			cleanup();
+
+			if (0 === code) {
+				resolve(code);
+			} else {
+				reject(`Ansible exited with code ${code}`);
+			}
+		});
+
+		proc.on('error', (err) => {
+			if (proc.connected) {
+				proc.kill();
+			}
+
+			cleanup();
+			reject(err);
+		});
 	});
 }
 
@@ -56,12 +84,8 @@ module.exports = async function(command) {
 	await confirm(command_line);
 	await saveHistory(command);
 
-	try {
-		await execute(command);
-		console.log('');
-		process.exit(0);
-	} catch (e) {
-		console.log('');
-		process.exit(1);
-	}
+	await execute(command);
+
+	console.log('');
+	process.exit(0);
 };