aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2015-08-10 15:51:14 +0200
committerLukas Larsson <[email protected]>2015-08-10 15:51:14 +0200
commitf3769aa1f4f4ab05b8c49acbee7c5bb57928266d (patch)
tree766e9c19ebd9e09a64cc7b238ed1572623784563 /erts/emulator
parent8dc55fcbf7d81942781ebbe58bc7bfcf46b4c035 (diff)
parent77003a6daed96f0beb6de324666ad31530974dbb (diff)
downloadotp-f3769aa1f4f4ab05b8c49acbee7c5bb57928266d.tar.gz
otp-f3769aa1f4f4ab05b8c49acbee7c5bb57928266d.tar.bz2
otp-f3769aa1f4f4ab05b8c49acbee7c5bb57928266d.zip
Merge branch 'maint'
* maint: erts: Don't abort when a system process is terminated
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_process.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index fc62581879..ebfb8afc8c 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -12053,7 +12053,8 @@ erts_do_exit_process(Process* p, Eterm reason)
#endif
if (p->static_flags & ERTS_STC_FLG_SYSTEM_PROC)
- erl_exit(1, "System process %T terminated: %T\n", p->common.id, reason);
+ erl_exit(ERTS_DUMP_EXIT, "System process %T terminated: %T\n",
+ p->common.id, reason);
#ifdef ERTS_SMP
ERTS_SMP_CHK_HAVE_ONLY_MAIN_PROC_LOCK(p);