Change handler id for sasl handler from sasl_h to sasl

5 files changed, 26 insertions, 26 deletions

diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index 5bc423afb6..a9292e7660 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -192,7 +192,7 @@
 	  will not log any progress-, crash-, or supervisor reports.
           If the SASL application is started,
 	  these log events will be sent to a second handler instance
-	  named <c>sasl_h</c>, according to values of the SASL
+	  named <c>sasl</c>, according to values of the SASL
 	  configuration parameter <c>sasl_error_logger</c>
 	  and <c>sasl_errlog_type</c>, see
 	  <seealso marker="sasl:sasl_app#deprecated_error_logger_config">sasl(6)
diff --git a/lib/kernel/doc/src/logger_chapter.xml b/lib/kernel/doc/src/logger_chapter.xml
index 34c65be47a..1195808160 100644
--- a/lib/kernel/doc/src/logger_chapter.xml
+++ b/lib/kernel/doc/src/logger_chapter.xml
@@ -630,7 +630,7 @@
 	  configuration parameters</seealso> can then be used as
 	  before, and the SASL reports will only be printed if the
 	  SASL application is running, through a second log handler
-	  named <c>sasl_h</c>.</p>
+	  named <c>sasl</c>.</p>
 	<p>All SASL reports have a metadata
 	  field <c>domain=>[beam,erlang,otp,sasl]</c>, which can be
 	  used, for example, by filters to stop or allow the
diff --git a/lib/kernel/test/logger_env_var_SUITE.erl b/lib/kernel/test/logger_env_var_SUITE.erl
index 081d4f0a80..6a8a868cc2 100644
--- a/lib/kernel/test/logger_env_var_SUITE.erl
+++ b/lib/kernel/test/logger_env_var_SUITE.erl
@@ -86,7 +86,7 @@ default(Config) ->
         lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 default_sasl_compatible(Config) ->
@@ -99,7 +99,7 @@ default_sasl_compatible(Config) ->
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(logger_simple,1,Hs),
-    true = lists:keymember(sasl_h,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_tty(Config) ->
@@ -111,7 +111,7 @@ error_logger_tty(Config) ->
         lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_tty_sasl_compatible(Config) ->
@@ -125,7 +125,7 @@ error_logger_tty_sasl_compatible(Config) ->
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(logger_simple,1,Hs),
-    true = lists:keymember(sasl_h,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_false(Config) ->
@@ -141,7 +141,7 @@ error_logger_false(Config) ->
     {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,SimpleFilters),
     true = lists:keymember(stop_progress,1,SimpleFilters),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_false_progress(Config) ->
@@ -158,7 +158,7 @@ error_logger_false_progress(Config) ->
     {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,SimpleFilters),
     false = lists:keymember(stop_progress,1,SimpleFilters),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_false_sasl_compatible(Config) ->
@@ -175,7 +175,7 @@ error_logger_false_sasl_compatible(Config) ->
     {domain,{_,{log,super,[beam,erlang,otp]}}} =
         lists:keyfind(domain,1,SimpleFilters),
     false = lists:keymember(stop_progress,1,SimpleFilters),
-    true = lists:keymember(sasl_h,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_silent(Config) ->
@@ -183,7 +183,7 @@ error_logger_silent(Config) ->
                                        [{error_logger,silent}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
     false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 error_logger_silent_sasl_compatible(Config) ->
@@ -192,7 +192,7 @@ error_logger_silent_sasl_compatible(Config) ->
                                         {logger_sasl_compatible,true}]),
     false = lists:keymember(?STANDARD_HANDLER,1,Hs),
     false = lists:keymember(logger_simple,1,Hs),
-    true = lists:keymember(sasl_h,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
     ok.
 
 
@@ -224,7 +224,7 @@ logger_file(Config) ->
         lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -247,7 +247,7 @@ logger_file_sasl_compatible(Config) ->
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(logger_simple,1,Hs),
-    true = lists:keymember(sasl_h,1,Hs),
+    true = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -270,7 +270,7 @@ logger_file_log_progress(Config) ->
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -290,7 +290,7 @@ logger_file_no_filter(Config) ->
     info = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
     false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -311,7 +311,7 @@ logger_file_no_filter_level(Config) ->
     error = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
     false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -332,7 +332,7 @@ logger_file_formatter(Config) ->
     info = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
     false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -357,7 +357,7 @@ logger_filters(Config) ->
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     LoggerFilters = maps:get(filters,Logger),
     true = lists:keymember(stop_progress,1,LoggerFilters),
 
@@ -410,7 +410,7 @@ logger_module_level(Config) ->
         lists:keyfind(domain,1,StdFilters),
     false = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     [{supervisor,error}] = ModuleLevels,
     ok.
 
@@ -432,7 +432,7 @@ logger_disk_log(Config) ->
         lists:keyfind(domain,1,StdFilters),
     true = lists:keymember(stop_progress,1,StdFilters),
     false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -453,7 +453,7 @@ logger_disk_log_formatter(Config) ->
     info = maps:get(level,StdC),
     [] = maps:get(filters,StdC),
     false = lists:keymember(logger_simple,1,Hs),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
 
     ok.
 
@@ -468,7 +468,7 @@ logger_undefined(Config) ->
     {domain,{_,{log,super,[beam,erlang,otp,sasl]}}} =
         lists:keyfind(domain,1,SimpleFilters),
     true = lists:keymember(stop_progress,1,SimpleFilters),
-    false = lists:keymember(sasl_h,1,Hs),
+    false = lists:keymember(sasl,1,Hs),
     ok.
 
 
diff --git a/lib/sasl/doc/src/sasl_app.xml b/lib/sasl/doc/src/sasl_app.xml
index eb1e87d9a3..0a9e6483f0 100644
--- a/lib/sasl/doc/src/sasl_app.xml
+++ b/lib/sasl/doc/src/sasl_app.xml
@@ -133,10 +133,10 @@
       obtained by setting the Kernel application environment
       variable <seealso marker="kernel:kernel_app#logger_sasl_compatible"><c>logger_sasl_compatible=true</c></seealso>. This will add a
       second instance of the standard logger handler
-      named <c>sasl_h</c>, which will only print the SASL reports. No
+      named <c>sasl</c>, which will only print the SASL reports. No
       SASL reports will then be printed by the Kernel logger
       handler.</p>
-    <p>The <c>sasl_h</c> handler will be configured according to the
+    <p>The <c>sasl</c> handler will be configured according to the
       values of the following SASL application environment
       variables.</p>
     <taglist>
diff --git a/lib/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl
index 57e0c6ca82..92b80694d7 100644
--- a/lib/sasl/src/sasl.erl
+++ b/lib/sasl/src/sasl.erl
@@ -131,7 +131,7 @@ add_sasl_logger(std, undefined) -> ok;
 add_sasl_logger(Dest, Level) ->
     FC = #{legacy_header=>true,
            single_line=>false},
-    ok = logger:add_handler(sasl_h,logger_std_h,
+    ok = logger:add_handler(sasl,logger_std_h,
                             #{level=>Level,
                               filter_default=>stop,
                               filters=>
@@ -146,7 +146,7 @@ add_sasl_logger(Dest, Level) ->
 delete_sasl_logger(undefined) -> ok;
 delete_sasl_logger(std) -> ok;
 delete_sasl_logger(_Type) ->
-    _ = logger:remove_handler(sasl_h),
+    _ = logger:remove_handler(sasl),
     ok.
 
 add_error_logger_mf(undefined) -> ok;