Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(cli): add sigterm handler and refactor #926

Merged
merged 2 commits into from
Apr 13, 2023
Merged

fix(cli): add sigterm handler and refactor #926

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1018797
fix(cli): add sigterm handler and refactor
pepoviola Apr 13, 2023
5028de0
fix linter
wirednkod Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 22 additions & 25 deletions javascript/packages/cli/src/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,24 @@ const debug = require("debug")("zombie-cli");
const program = new Command("zombienet");

let network: Network | undefined;
let alreadyTryToStop = false;

async function handleTermination(userInterrupted = false) {
process.env.terminating = "1";
if (network && !alreadyTryToStop) {
alreadyTryToStop = true;
if(userInterrupted) console.log("Ctrl+c detected...");
debug("removing namespace: " + network.namespace);
await network.dumpLogs();
await network.stop();
}
}

// Ensure to log the uncaught exceptions
// to debug the problem, also exit because we don't know
// what happens there.
process.on("uncaughtException", async (err) => {
if (network) {
debug("removing namespace: " + network.namespace);
await network.stop();
}
await handleTermination();
console.log(`uncaughtException`);
console.log(err);
debug(err);
Expand All @@ -31,10 +40,7 @@ process.on("uncaughtException", async (err) => {
// accidentally don't have a 'catch' for.
// http://www.hacksrus.net/blog/2015/08/a-solution-to-swallowed-exceptions-in-es6s-promises/
process.on("unhandledRejection", async (err) => {
if (network) {
debug("removing namespace: " + network.namespace);
await network.stop();
}
await handleTermination();
debug(err);
console.log(
`\n${decorators.red("UnhandledRejection: ")} \t ${decorators.bright(
Expand All @@ -45,27 +51,18 @@ process.on("unhandledRejection", async (err) => {
});

// Handle ctrl+c to trigger `exit`.
let alreadyTry = false;
process.on("SIGINT", async function () {
process.env.terminating = "1";
if (network && !alreadyTry) {
alreadyTry = true;
const msg = "Ctrl+c ... removing namespace: " + network.namespace;
console.log(decorators.magenta(msg));
debug(msg);
await network.stop();
}
process.exit(2);
await handleTermination();
process.exit();
});

process.on("SIGTERM", async function () {
await handleTermination();
process.exit();
});

process.on("exit", async function () {
process.env.terminating = "1";
if (network && !alreadyTry) {
alreadyTry = true;
debug("removing namespace: " + network.namespace);
await network.dumpLogs();
await network.stop();
}
await handleTermination();
const exitCode = process.exitCode !== undefined ? process.exitCode : 2;
// use exitCode set by mocha or 2 as default.
process.exit(exitCode);
Expand Down