diff options
| author | Magnus Henoch <[email protected]> | 2016-02-08 17:56:37 +0000 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-03-24 14:42:26 +0100 |
| commit | 2ebbcbc23fdb7856ee46316bb35067c755838012 (patch) | |
| tree | 8e43dd905d1f2881f4ca7ca4208738e7e0126530 /lib/ssl/src | |
| parent | ab418313123e98d5de15e2e71ac169afdad8d3f8 (diff) | |
| download | otp-2ebbcbc23fdb7856ee46316bb35067c755838012.tar.gz otp-2ebbcbc23fdb7856ee46316bb35067c755838012.tar.bz2 otp-2ebbcbc23fdb7856ee46316bb35067c755838012.zip | |
TLS distribution: shut down accept process cleanly
In ssl_tls_dist_proxy:accept_loop/3, handle {error, closed} by
exiting normally. This prevents a spurious error report at node
shutdown.
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_tls_dist_proxy.erl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl index 4c789793ec..8a39bde255 100644 --- a/lib/ssl/src/ssl_tls_dist_proxy.erl +++ b/lib/ssl/src/ssl_tls_dist_proxy.erl @@ -195,6 +195,11 @@ accept_loop(Proxy, erts = Type, Listen, Extra) -> {_Kernel, unsupported_protocol} -> exit(unsupported_protocol) end; + {error, closed} -> + %% The listening socket is closed: the proxy process is + %% shutting down. Exit normally, to avoid generating a + %% spurious error report. + exit(normal); Error -> exit(Error) end, |