diff options
| author | Lukas Larsson <[email protected]> | 2016-06-03 11:43:47 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-06-03 11:43:47 +0200 |
| commit | 85996c92853e90cb233a1405b1c8c7bb1b8ca54e (patch) | |
| tree | 31a39b2f82adee6f34cb83d8cc66e786006b65ae /erts | |
| parent | 45a4a46333b1e8e6f66ba923deaf947a67ae7737 (diff) | |
| download | otp-85996c92853e90cb233a1405b1c8c7bb1b8ca54e.tar.gz otp-85996c92853e90cb233a1405b1c8c7bb1b8ca54e.tar.bz2 otp-85996c92853e90cb233a1405b1c8c7bb1b8ca54e.zip | |
erts: make HEART_NO_KILL have to be set to TRUE
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/etc/common/heart.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c index b6fbfd075c..0dd82cc036 100644 --- a/erts/etc/common/heart.c +++ b/erts/etc/common/heart.c @@ -526,8 +526,10 @@ static void kill_old_erlang(void){ HANDLE erlh; DWORD exit_code; + char* envvar = NULL; - if (is_env_set(HEART_NO_KILL)) + envvar = get_env(HEART_NO_KILL); + if (!envvar || strcmp(envvar, "TRUE") == 0) return; if(heart_beat_kill_pid != 0){ @@ -561,13 +563,14 @@ kill_old_erlang(void){ pid_t pid; int i, res; int sig = SIGKILL; - char *sigenv = NULL; + char *envvar = NULL; - if (is_env_set(HEART_NO_KILL)) + envvar = get_env(HEART_NO_KILL); + if (!envvar || strcmp(envvar, "TRUE") == 0) return; - sigenv = get_env(HEART_KILL_SIGNAL); - if (sigenv && strcmp(sigenv, "SIGABRT") == 0) { + envvar = get_env(HEART_KILL_SIGNAL); + if (envvar && strcmp(envvar, "SIGABRT") == 0) { print_error("kill signal SIGABRT requested"); sig = SIGABRT; } |