[logger] Unregister handler names before terminating

2 files changed, 10 insertions, 2 deletions

diff --git a/lib/kernel/src/logger_disk_log_h.erl b/lib/kernel/src/logger_disk_log_h.erl
index a074d0210e..394c7b7320 100644
--- a/lib/kernel/src/logger_disk_log_h.erl
+++ b/lib/kernel/src/logger_disk_log_h.erl
@@ -249,7 +249,8 @@ init([Name,
                                        max_no_files:=MNF}},
       State = #{dl_sync_int := DLSyncInt}]) ->
 
-    register(?name_to_reg_name(?MODULE,Name), self()),
+    RegName = ?name_to_reg_name(?MODULE,Name),
+    register(RegName, self()),
     process_flag(trap_exit, true),
     process_flag(message_queue_data, off_heap),
 
@@ -296,10 +297,12 @@ init([Name,
                     enter_loop(Config1, State1)
             catch
                 _:Error ->
+                    unregister(RegName),
                     logger_h_common:error_notify({open_disk_log,Name,Error}),
                     proc_lib:init_ack(Error)
             end;
         Error ->
+            unregister(RegName),
             logger_h_common:error_notify({open_disk_log,Name,Error}),
             proc_lib:init_ack(Error)
     end.
@@ -426,6 +429,7 @@ terminate(Reason, State = #{id := Name}) ->
     _ = logger_h_common:cancel_timer(maps:get(rep_sync_tref, State,
                                               undefined)),
     _ = close_disk_log(Name, normal),
+    unregister(?name_to_reg_name(?MODULE, Name)),
     logger_h_common:stop_or_restart(Name, Reason, State).
 
 code_change(_OldVsn, State, _Extra) ->
diff --git a/lib/kernel/src/logger_std_h.erl b/lib/kernel/src/logger_std_h.erl
index ce9daa50ab..801d05853a 100644
--- a/lib/kernel/src/logger_std_h.erl
+++ b/lib/kernel/src/logger_std_h.erl
@@ -229,7 +229,8 @@ log(LogEvent, Config = #{id := Name,
 
 init([Name, Config = #{config := HConfig},
       State0 = #{type := Type, file_ctrl_sync_int := FileCtrlSyncInt}]) ->    
-    register(?name_to_reg_name(?MODULE,Name), self()),
+    RegName = ?name_to_reg_name(?MODULE,Name),
+    register(RegName, self()),
     process_flag(trap_exit, true),
     process_flag(message_queue_data, off_heap),
 
@@ -261,10 +262,12 @@ init([Name, Config = #{config := HConfig},
                     enter_loop(Config1, State1)
             catch
                 _:Error ->
+                    unregister(RegName),
                     logger_h_common:error_notify({init_handler,Name,Error}),
                     proc_lib:init_ack(Error)
             end;
         Error ->
+            unregister(RegName),
             logger_h_common:error_notify({init_handler,Name,Error}),
             proc_lib:init_ack(Error)
     end.
@@ -415,6 +418,7 @@ terminate(Reason, State = #{id:=Name, file_ctrl_pid:=FWPid,
         false ->
             ok
     end,
+    unregister(?name_to_reg_name(?MODULE, Name)),
     logger_h_common:stop_or_restart(Name, Reason, State).
                                                   
 code_change(_OldVsn, State, _Extra) ->