aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Dimitrov <[email protected]>2018-06-18 13:17:07 +0200
committerPéter Dimitrov <[email protected]>2018-06-20 15:18:37 +0200
commit3c3d2d8b14501b4b279deae643490f92f98a99d5 (patch)
tree410e3660db94622302e4a00c2962e5875470c15f
parente94c5fad7304aa7b5cd15646a1fd246aae460a3f (diff)
downloadotp-3c3d2d8b14501b4b279deae643490f92f98a99d5.tar.gz
otp-3c3d2d8b14501b4b279deae643490f92f98a99d5.tar.bz2
otp-3c3d2d8b14501b4b279deae643490f92f98a99d5.zip
ssl: Rename logger_ssl_formatter to ssl_logger
Change-Id: I4aff56c95d7ea8c46db40b0fa0f6f9b43f00bf8a
-rw-r--r--lib/ssl/src/Makefile2
-rw-r--r--lib/ssl/src/ssl.app.src2
-rw-r--r--lib/ssl/src/ssl_app.erl2
-rw-r--r--lib/ssl/src/ssl_logger.erl (renamed from lib/ssl/src/logger_ssl_formatter.erl)5
4 files changed, 6 insertions, 5 deletions
diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
index 335e1c55c3..1db18d4e5a 100644
--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
@@ -87,7 +87,7 @@ MODULES= \
ssl_v3 \
tls_v1 \
dtls_v1 \
- logger_ssl_formatter
+ ssl_logger
INTERNAL_HRL_FILES = \
ssl_alert.hrl ssl_cipher.hrl \
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index e71d9565a9..9679ea4687 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -52,7 +52,7 @@
ssl_crl_cache_api,
ssl_crl_hash_dir,
%% Logging
- logger_ssl_formatter,
+ ssl_logger,
%% App structure
ssl_app,
ssl_sup,
diff --git a/lib/ssl/src/ssl_app.erl b/lib/ssl/src/ssl_app.erl
index 1beaa513b4..2a5047c75c 100644
--- a/lib/ssl/src/ssl_app.erl
+++ b/lib/ssl/src/ssl_app.erl
@@ -41,7 +41,7 @@ stop(_State) ->
start_logger() ->
Config = #{level => debug,
filter_default => stop,
- formatter => {logger_ssl_formatter, #{}}},
+ 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).
diff --git a/lib/ssl/src/logger_ssl_formatter.erl b/lib/ssl/src/ssl_logger.erl
index de4c09be79..20e38c4882 100644
--- a/lib/ssl/src/logger_ssl_formatter.erl
+++ b/lib/ssl/src/ssl_logger.erl
@@ -18,7 +18,7 @@
%% %CopyrightEnd%
%%
--module(logger_ssl_formatter).
+-module(ssl_logger).
-export([format/2]).
@@ -36,6 +36,8 @@
%%-------------------------------------------------------------------------
%% External API
%%-------------------------------------------------------------------------
+
+%% SSL log formatter
format(#{level:= _Level, msg:= {report, Msg}, meta:= _Meta}, _Config0) ->
#{direction := Direction,
protocol := Protocol,
@@ -50,7 +52,6 @@ format(#{level:= _Level, msg:= {report, Msg}, meta:= _Meta}, _Config0) ->
[]
end.
-
%%-------------------------------------------------------------------------
%% Handshake Protocol
%%-------------------------------------------------------------------------