From bfc1553ba680bdc4bdf9d592d0ede5953aa44c70 Mon Sep 17 00:00:00 2001 From: Kiko Beats Date: Sat, 5 Oct 2019 11:30:32 +0200 Subject: [PATCH 1/4] Gracefully shutdown: exit after server is closed --- packages/micro/bin/micro.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/micro/bin/micro.js b/packages/micro/bin/micro.js index 7dd343d1..61b70998 100755 --- a/packages/micro/bin/micro.js +++ b/packages/micro/bin/micro.js @@ -205,7 +205,10 @@ function startEndpoint(module, endpoint) { server.listen(...endpoint, () => { const details = server.address(); - registerShutdown(() => server.close()); + registerShutdown(() => { + server.close(); + process.exit(); + }); // `micro` is designed to run only in production, so // this message is perfectly for prod From 36aeb506b5d56962ace106205010254db6adab9f Mon Sep 17 00:00:00 2001 From: Kiko Beats Date: Sun, 6 Oct 2019 11:32:06 +0200 Subject: [PATCH 2/4] refactor: unify registerShutdown calls --- packages/micro/bin/micro.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/micro/bin/micro.js b/packages/micro/bin/micro.js index 61b70998..abf2e886 100755 --- a/packages/micro/bin/micro.js +++ b/packages/micro/bin/micro.js @@ -204,8 +204,9 @@ function startEndpoint(module, endpoint) { server.listen(...endpoint, () => { const details = server.address(); - + registerShutdown(() => { + console.log('micro: Gracefully shutting down. Please wait...') server.close(); process.exit(); }); @@ -228,8 +229,6 @@ async function start() { for (const endpoint of args['--listen']) { startEndpoint(loadedModule, endpoint); } - - registerShutdown(() => console.log('micro: Gracefully shutting down. Please wait...')); } start(); From 2636e3c4439ddeffc55a7510f79d229cf70108a9 Mon Sep 17 00:00:00 2001 From: Kiko Beats Date: Sun, 6 Oct 2019 17:22:28 +0200 Subject: [PATCH 3/4] Update micro.js --- packages/micro/bin/micro.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/micro/bin/micro.js b/packages/micro/bin/micro.js index abf2e886..1ce8d953 100755 --- a/packages/micro/bin/micro.js +++ b/packages/micro/bin/micro.js @@ -206,7 +206,7 @@ function startEndpoint(module, endpoint) { const details = server.address(); registerShutdown(() => { - console.log('micro: Gracefully shutting down. Please wait...') + console.log('micro: Gracefully shutting down. Please wait...'); server.close(); process.exit(); }); From c4a69d8bae064ee637b586e8b7ccd5bc7813e706 Mon Sep 17 00:00:00 2001 From: Kiko Beats Date: Sun, 6 Oct 2019 17:33:43 +0200 Subject: [PATCH 4/4] Update micro.js --- packages/micro/bin/micro.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/micro/bin/micro.js b/packages/micro/bin/micro.js index 1ce8d953..01b5cb44 100755 --- a/packages/micro/bin/micro.js +++ b/packages/micro/bin/micro.js @@ -204,7 +204,6 @@ function startEndpoint(module, endpoint) { server.listen(...endpoint, () => { const details = server.address(); - registerShutdown(() => { console.log('micro: Gracefully shutting down. Please wait...'); server.close();