Merge branch 'maint'

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/kernel/src/logger_simple_h.erl b/lib/kernel/src/logger_simple_h.erl
index 8b51dd8569..fe181722f3 100644
--- a/lib/kernel/src/logger_simple_h.erl
+++ b/lib/kernel/src/logger_simple_h.erl
@@ -50,7 +50,6 @@ removing_handler(#{id:=simple}) ->
             ok;
         Pid ->
             Ref = erlang:monitor(process,Pid),
-            unlink(Pid),
             Pid ! stop,
             receive {'DOWN',Ref,process,Pid,_} ->
                     ok
@@ -99,7 +98,11 @@ loop(Buffer) ->
                     replay_buffer(Buffer);
                 _ ->
                     ok
-            end;
+            end,
+            %% Before stopping, we unlink the logger process to avoid
+            %% an unexpected EXIT message
+            unlink(whereis(logger)),
+            ok;
         {log,#{msg:=_,meta:=#{time:=_}}=Log} ->
             do_log(Log),
             loop(update_buffer(Buffer,Log));