diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-04-05 08:29:00 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-04-05 08:29:00 +0200 |
| commit | ad46aea945c946ea07d7369d9513d3e66442378f (patch) | |
| tree | cd5907e9903ab88a9b5ba3560597359e96b25040 /lib | |
| parent | 6da1d0cb1f7e83163dbcec64a59b88e13616b2f1 (diff) | |
| parent | 2ebbcbc23fdb7856ee46316bb35067c755838012 (diff) | |
| download | otp-ad46aea945c946ea07d7369d9513d3e66442378f.tar.gz otp-ad46aea945c946ea07d7369d9513d3e66442378f.tar.bz2 otp-ad46aea945c946ea07d7369d9513d3e66442378f.zip | |
Merge branch 'legoscia/tls-dist-clean-shutdown/PR-962/OTP-13431'
* legoscia/tls-dist-clean-shutdown/PR-962/OTP-13431:
TLS distribution: shut down accept process cleanly
Diffstat (limited to 'lib')
| -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, |