diff options
| author | Lars Thorsen <[email protected]> | 2017-06-05 10:18:31 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2017-06-05 10:18:31 +0200 |
| commit | 645371eb3a5cdcdbf73bde2ec906181ec701e1cf (patch) | |
| tree | 03f5f7f2bcff6b67316c0e7364c75b0066e7aea3 /erts | |
| parent | 736de00985c1ed44760e52283eeb727d3f14bb1f (diff) | |
| parent | 87bca557898bea79dbd53d59b21f6e7384e3a25d (diff) | |
| download | otp-645371eb3a5cdcdbf73bde2ec906181ec701e1cf.tar.gz otp-645371eb3a5cdcdbf73bde2ec906181ec701e1cf.tar.bz2 otp-645371eb3a5cdcdbf73bde2ec906181ec701e1cf.zip | |
Merge branch 'maint-19' into maint
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/notes.xml | 20 | ||||
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 5 | ||||
| -rw-r--r-- | erts/vsn.mk | 2 |
3 files changed, 26 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 7021da7fb3..13706db8b2 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -32,6 +32,26 @@ <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 8.3.4</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Add option to make SIGTERM trigger the OS default + behaviour instead of doing a gracefull shutdown. To + activate this bahviour the environment variable + ERL_ZZ_SIGTERM_KILL should be set to "true". This option + only works in OTP 19 as OTP 20 will have a different way + to deal with SIGTERM.</p> + <p> + Own Id: OTP-14418 Aux Id: ERIERL-15 </p> + </item> + </list> + </section> + +</section> + <section><title>Erts 8.3.3</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index 3010af44be..de8481b206 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -838,6 +838,11 @@ void sys_init_suspend_handler(void) void erts_sys_unix_later_init(void) { + char env[4]; + size_t envsz = sizeof(env); + if (erts_sys_getenv_raw("ERL_ZZ_SIGTERM_KILL", env, &envsz) == 0) + if (envsz == 4 && sys_strncmp("true",env,4) == 0) + return; sys_signal(SIGTERM, request_stop); } diff --git a/erts/vsn.mk b/erts/vsn.mk index a83c1ab761..dc17ed8b3d 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 8.3.3 +VSN = 8.3.4 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |