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, 1 insertions, 1 deletions

diff --git a/lib/kernel/test/logger_std_h_SUITE.erl b/lib/kernel/test/logger_std_h_SUITE.erl
index 0930cd4211..3426567bbf 100644
--- a/lib/kernel/test/logger_std_h_SUITE.erl
+++ b/lib/kernel/test/logger_std_h_SUITE.erl
@@ -280,7 +280,7 @@ formatter_fail(Config) ->
     ok = logger:set_handler_config(?MODULE,formatter,{?MODULE,bad_return}),
     logger:notice(?msg,?domain),
     try_match_file(Log,
-                   escape(Got3)++"FORMATTER ERROR: bad_return_value",
+                   escape(Got3)++"FORMATTER ERROR: bad return value",
                    5000),
 
     %% Check that handler is still alive and was never dead