diff options
| author | Zandra <[email protected]> | 2015-12-28 13:48:29 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-12-28 13:48:29 +0100 |
| commit | 788cd43bfdc56a5c4ac99049af8ab31a1170ec1b (patch) | |
| tree | 77144b13cb643761e770995a293bf23dbc8b8c38 /lib/ssl/src/ssl_tls_dist_proxy.erl | |
| parent | 7be5ba1d5aa0809021c69e26ddbecf29e65c1fce (diff) | |
| parent | dbd58427c1447af394ea5449cb4cdc32e446918b (diff) | |
| download | otp-788cd43bfdc56a5c4ac99049af8ab31a1170ec1b.tar.gz otp-788cd43bfdc56a5c4ac99049af8ab31a1170ec1b.tar.bz2 otp-788cd43bfdc56a5c4ac99049af8ab31a1170ec1b.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/src/ssl_tls_dist_proxy.erl')
| -rw-r--r-- | lib/ssl/src/ssl_tls_dist_proxy.erl | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl index d384264b53..3edd352891 100644 --- a/lib/ssl/src/ssl_tls_dist_proxy.erl +++ b/lib/ssl/src/ssl_tls_dist_proxy.erl @@ -204,6 +204,11 @@ accept_loop(Proxy, world = Type, Listen, Extra) -> end), ok = ssl:controlling_process(SslSocket, PairHandler), flush_old_controller(PairHandler, SslSocket); + {error, {options, _}} = Error -> + %% Bad options: that's probably our fault. Let's log that. + error_logger:error_msg("Cannot accept TLS distribution connection: ~s~n", + [ssl:format_error(Error)]), + gen_tcp:close(Socket); _ -> gen_tcp:close(Socket) end; @@ -235,6 +240,11 @@ setup_proxy(Ip, Port, Parent) -> Err -> Parent ! {self(), Err} end; + {error, {options, _}} = Err -> + %% Bad options: that's probably our fault. Let's log that. + error_logger:error_msg("Cannot open TLS distribution connection: ~s~n", + [ssl:format_error(Err)]), + Parent ! {self(), Err}; Err -> Parent ! {self(), Err} end. |