Merge branch 'siri/logger/post-21-continues/OTP-15132' into maint

* siri/logger/post-21-continues/OTP-15132:
  [logger] Read config before terminating handler process
  [error_logger] Handle report_cb with arity 2
  [proc_lib] Improve crash reports for single line logging
  [logger] Include single_line option to report_cb
  [logger] Check for deadlock when removing filters
  [logger] Fix spec for handler callbacks to always return ok
  [logger] Increase timetrap timer for handler_requests_under_load test
  [logger] Improve code coverage in test
  [logger] Refactor, and add error detection for configuration
  [logger] Fix logger_disk_log_h_SUITE:sync and add som debug info
  [logger] Update doc about file options in logger_std_h
  [logger] Remove encoding option from logger_formatter
  Remove outdated reference to error loggers
  [logger] Refactor some logger internals

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/kernel/src/logger_disk_log_h.erl b/lib/kernel/src/logger_disk_log_h.erl
index e56531c3cb..a8f141f135 100644
--- a/lib/kernel/src/logger_disk_log_h.erl
+++ b/lib/kernel/src/logger_disk_log_h.erl
@@ -225,7 +225,7 @@ removing_handler(#{id:=Name}) ->
 
 %%%-----------------------------------------------------------------
 %%% Log a string or report
--spec log(LogEvent, Config) -> ok | dropped when
+-spec log(LogEvent, Config) -> ok when
       LogEvent :: logger:log_event(),
       Config :: logger:handler_config().
 
@@ -294,7 +294,7 @@ init([Name,
                             %% initial start
                             ok
                     end,
-                    enter_loop(Config1, State1)
+                    gen_server:enter_loop(?MODULE, [], State1)
             catch
                 _:Error ->
                     unregister(RegName),
@@ -307,9 +307,6 @@ init([Name,
             proc_lib:init_ack(Error)
     end.
 
-enter_loop(_Config,State) ->
-    gen_server:enter_loop(?MODULE,[],State).
-
 %% This is the synchronous log event.
 handle_call({log, Bin}, _From, State) ->
     {Result,State1} = do_log(Bin, call, State),
@@ -429,8 +426,9 @@ terminate(Reason, State = #{id := Name}) ->
     _ = logger_h_common:cancel_timer(maps:get(rep_sync_tref, State,
                                               undefined)),
     _ = close_disk_log(Name, normal),
+    ok = logger_h_common:stop_or_restart(Name, Reason, State),
     unregister(?name_to_reg_name(?MODULE, Name)),
-    logger_h_common:stop_or_restart(Name, Reason, State).
+    ok.
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.