From a2d6b9a11bb51f85848f59982277b16197f7e6c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Dimitrov?= <peterdmv@erlang.org>
Date: Tue, 12 Mar 2019 11:48:30 +0100
Subject: ssl: Improve ssl logging

Remove function ssl:set_log_level/1. Its functionality is already
implemented by logger:set_application_level/2.

Set log level for ssl modules to debug at application start.
Former implementation required an extra call to
logger:set_application_level/2 (beside setting ssl option
{log_level, debug}) to enable debug logging.

Change-Id: Id21be7fd58915e11124cc136bb92d8a7526b8a74
---
 lib/ssl/doc/src/ssl.xml          | 11 -----------
 lib/ssl/src/ssl.erl              | 29 +----------------------------
 lib/ssl/src/ssl_app.erl          |  6 +++---
 lib/ssl/test/ssl_basic_SUITE.erl |  2 --
 4 files changed, 4 insertions(+), 44 deletions(-)

(limited to 'lib')

diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml
index b145aac6ab..60fa70c90c 100644
--- a/lib/ssl/doc/src/ssl.xml
+++ b/lib/ssl/doc/src/ssl.xml
@@ -1657,17 +1657,6 @@ fun(srp, Username :: string(), UserState :: term()) ->
       </desc>
     </func>
 
-    <func>
-      <name since="OTP 22.0">set_log_level(Level) -> ok | {error, Reason}</name>
-      <fsummary>Sets log level for the SSL application.</fsummary>
-      <type>
-        <v>Level = atom()</v>
-      </type>
-      <desc>
-        <p>Sets log level for the SSL application.</p>
-      </desc>
-    </func>
-
     <func>
       <name since="OTP R14B">shutdown(SslSocket, How) -> ok | {error, Reason}</name>
       <fsummary>Immediately closes a socket.</fsummary>
diff --git a/lib/ssl/src/ssl.erl b/lib/ssl/src/ssl.erl
index 5a2d31ffc2..f7500b6f5f 100644
--- a/lib/ssl/src/ssl.erl
+++ b/lib/ssl/src/ssl.erl
@@ -55,8 +55,7 @@
          format_error/1, renegotiate/1, prf/5, negotiated_protocol/1, 
 	 connection_information/1, connection_information/2]).
 %% Misc
--export([handle_options/2, tls_version/1, new_ssl_options/3, suite_to_str/1,
-         set_log_level/1]).
+-export([handle_options/2, tls_version/1, new_ssl_options/3, suite_to_str/1]).
 
 -deprecated({ssl_accept, 1, eventually}).
 -deprecated({ssl_accept, 2, eventually}).
@@ -1167,32 +1166,6 @@ suite_to_str(Cipher) ->
     ssl_cipher_format:suite_to_str(Cipher).
 
 
-%%--------------------------------------------------------------------
--spec set_log_level(atom()) -> ok | {error, term()}.
-%%
-%% Description: Set log level for the SSL application
-%%--------------------------------------------------------------------
-set_log_level(Level) ->
-    case application:get_all_key(ssl) of
-        {ok, PropList} ->
-            Modules = proplists:get_value(modules, PropList),
-            set_module_level(Modules, Level);
-        undefined ->
-            {error, ssl_not_started}
-    end.
-
-set_module_level(Modules, Level) ->
-    Fun = fun (Module) ->
-                  ok = logger:set_module_level(Module, Level)
-          end,
-    try lists:map(Fun, Modules) of
-        _ ->
-            ok
-    catch
-        error:{badmatch, Error} ->
-            Error
-    end.
-
 %%%--------------------------------------------------------------
 %%% Internal functions
 %%%--------------------------------------------------------------------
diff --git a/lib/ssl/src/ssl_app.erl b/lib/ssl/src/ssl_app.erl
index 2a5047c75c..9e6d676bef 100644
--- a/lib/ssl/src/ssl_app.erl
+++ b/lib/ssl/src/ssl_app.erl
@@ -44,11 +44,11 @@ start_logger() ->
                formatter => {ssl_logger, #{}}},
     Filter = {fun logger_filters:domain/2,{log,sub,[otp,ssl]}},
     logger:add_handler(ssl_handler, logger_std_h, Config),
-    logger:add_handler_filter(ssl_handler, filter_non_ssl, Filter).
+    logger:add_handler_filter(ssl_handler, filter_non_ssl, Filter),
+    logger:set_application_level(ssl, debug).
 
 %%
 %% Description: Stop SSL logger
 stop_logger() ->
+    logger:unset_application_level(ssl),
     logger:remove_handler(ssl_handler).
-
-
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 6bf58766f8..b566e817f7 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -5818,8 +5818,6 @@ tls13_unsupported_sign_algo_cert_client_auth_ssl_server_openssl_client() ->
      [{doc,"TLS 1.3: Test client authentication with unsupported signature_algorithm_cert"}].
 
 tls13_unsupported_sign_algo_cert_client_auth_ssl_server_openssl_client(Config) ->
-    ssl:set_log_level(debug),
-
     ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config),
 
     ServerOpts0 = ssl_test_lib:ssl_options(server_rsa_opts, Config),
-- 
cgit v1.2.3