aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-04-10 10:44:54 +0200
committerLukas Larsson <[email protected]>2017-04-10 10:44:54 +0200
commit82b17d7334c2449b66feb9ec2195d7b211688557 (patch)
tree78f7687eacb4080d58ee36ea5b0ed9dbdc19530d
parente837d55f1d0bfca428fd8f219af71e09c0f98748 (diff)
parent161630f3e1e870dee50cd5c5161e9f09ebe9066b (diff)
downloadotp-82b17d7334c2449b66feb9ec2195d7b211688557.tar.gz
otp-82b17d7334c2449b66feb9ec2195d7b211688557.tar.bz2
otp-82b17d7334c2449b66feb9ec2195d7b211688557.zip
Merge branch 'sr/epmd/exit-1-if-living-nodes/PR-1402/OTP-14324'
* sr/epmd/exit-1-if-living-nodes/PR-1402/OTP-14324: Don't exit 0 if killing epmd is impossible because there's living nodes
-rw-r--r--erts/epmd/src/epmd_cli.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/epmd/src/epmd_cli.c b/erts/epmd/src/epmd_cli.c
index 6fd27d46ea..b10b331cb5 100644
--- a/erts/epmd/src/epmd_cli.c
+++ b/erts/epmd/src/epmd_cli.c
@@ -46,10 +46,11 @@ void kill_epmd(EpmdVars *g)
if ((rval = read_fill(fd,buf,2)) == 2) {
if (buf[0] == 'O' && buf[1] == 'K') {
printf("Killed\n");
+ epmd_cleanup_exit(g,0);
} else {
printf("Killing not allowed - living nodes in database.\n");
+ epmd_cleanup_exit(g,1);
}
- epmd_cleanup_exit(g,0);
} else if (rval < 0) {
printf("epmd: failed to read answer from local epmd\n");
epmd_cleanup_exit(g,1);