diff options
| author | Péter Dimitrov <[email protected]> | 2018-07-05 09:57:55 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2018-07-05 09:57:55 +0200 |
| commit | a8da98f69b252aba6e6f31cd7217936204be45df (patch) | |
| tree | 192d4b9509d6c905c6a6f119a5de4a4aca8d474c /lib/ssl/doc/src | |
| parent | 26f54151e90abc901a5e58dfc72110925b42522c (diff) | |
| parent | bde179fd47062cda33dc801d5117bf74dde14acb (diff) | |
| download | otp-a8da98f69b252aba6e6f31cd7217936204be45df.tar.gz otp-a8da98f69b252aba6e6f31cd7217936204be45df.tar.bz2 otp-a8da98f69b252aba6e6f31cd7217936204be45df.zip | |
Merge branch 'peterdmv/ssl/use_logger/OTP-15055'
* peterdmv/ssl/use_logger/OTP-15055:
ssl: Prepare for release
ssl: Add documentation to the log_level option
ssl: Add support for stateful logging
ssl: Add set_log_level/1
ssl: Rename logger_ssl_formatter to ssl_logger
ssl: Update domain filter, use log macros
ssl: Add logging for TLS Handshake Protocol
ssl: Add logging for TLS record protocol
ssl: Use logger API instead of legacy error_logger
ssl: Add initial ssl log formatter
ssl: Define VSN macro in source
Change-Id: I4e801193570a941d397d59610d98cfbf3ec49210
Diffstat (limited to 'lib/ssl/doc/src')
| -rw-r--r-- | lib/ssl/doc/src/ssl.xml | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/lib/ssl/doc/src/ssl.xml b/lib/ssl/doc/src/ssl.xml index e3deb1c8a4..2f4cc7d8d7 100644 --- a/lib/ssl/doc/src/ssl.xml +++ b/lib/ssl/doc/src/ssl.xml @@ -88,6 +88,7 @@ <p><c>| {client_preferred_next_protocols, {client | server, [binary()]} | {client | server, [binary()], binary()}}</c></p> <p><c>| {log_alert, boolean()}</c></p> + <p><c>| {log_level, atom()}</c></p> <p><c>| {server_name_indication, hostname() | disable}</c></p> <p><c>| {customize_hostname_check, list()}</c></p> <p><c>| {sni_hosts, [{hostname(), [ssl_option()]}]}</c></p> @@ -796,7 +797,17 @@ fun(srp, Username :: string(), UserState :: term()) -> the client.</p></item> <tag><c>{log_alert, boolean()}</c></tag> - <item><p>If set to <c>false</c>, error reports are not displayed.</p></item> + <item><p>If set to <c>false</c>, error reports are not displayed.</p> + <p>Deprecated in OTP 22, use <seealso marker="#log_level">log_level</seealso> instead.</p> + </item> + + <tag><marker id="log_level"/><c>{log_level, atom()}</c></tag> + <item><p>Specifies the log level for TLS/DTLS. It can take the following + values (ordered by increasing verbosity level): <c>emergency, alert, critical, error, + warning, notice, info, debug.</c></p> + <p>At verbosity level <c>notice</c> and above error reports are + displayed in TLS. The level <c>debug</c> triggers verbose logging of TLS protocol + messages and logging of ignored alerts in DTLS.</p></item> <tag><c>{honor_cipher_order, boolean()}</c></tag> <item><p>If set to <c>true</c>, use the server preference for cipher @@ -1397,6 +1408,17 @@ fun(srp, Username :: string(), UserState :: term()) -> </func> <func> + <name>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>shutdown(SslSocket, How) -> ok | {error, Reason}</name> <fsummary>Immediately closes a socket.</fsummary> <type> |