diff options
| author | Magnus Henoch <[email protected]> | 2015-10-20 16:25:13 +0100 |
|---|---|---|
| committer | CHANGEME <CHANGEME> | 2015-10-20 16:25:13 +0100 |
| commit | e30f65485aec78c6bd65e25e5a185100b3f8f042 (patch) | |
| tree | c612f4572bcd2b9acbce97e4e81b120af5494a1b | |
| parent | 12002949e5435d19c750fe2cd8e897b4059f875a (diff) | |
| download | otp-e30f65485aec78c6bd65e25e5a185100b3f8f042.tar.gz otp-e30f65485aec78c6bd65e25e5a185100b3f8f042.tar.bz2 otp-e30f65485aec78c6bd65e25e5a185100b3f8f042.zip | |
Adjust shutdown strategies for distribution over TLS
Change ssl_dist_sup to be considered as a supervisor with infinite
shutdown time.
Change the ssl_connection_dist instance of tls_connection_sup to have
infinite shutdown time.
This avoids spurious error messages when shutting down a node that
uses distribution over TLS.
| -rw-r--r-- | lib/ssl/src/inet_tls_dist.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_dist_sup.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl index 7367b5c224..a633df1558 100644 --- a/lib/ssl/src/inet_tls_dist.erl +++ b/lib/ssl/src/inet_tls_dist.erl @@ -29,7 +29,7 @@ childspecs() -> {ok, [{ssl_dist_sup,{ssl_dist_sup, start_link, []}, - permanent, 2000, worker, [ssl_dist_sup]}]}. + permanent, infinity, supervisor, [ssl_dist_sup]}]}. select(Node) -> case split_node(atom_to_list(Node), $@, []) of diff --git a/lib/ssl/src/ssl_dist_sup.erl b/lib/ssl/src/ssl_dist_sup.erl index 58efeaf892..0c7fc77db7 100644 --- a/lib/ssl/src/ssl_dist_sup.erl +++ b/lib/ssl/src/ssl_dist_sup.erl @@ -69,7 +69,7 @@ connection_manager_child_spec() -> Name = ssl_connection_dist, StartFunc = {tls_connection_sup, start_link_dist, []}, Restart = permanent, - Shutdown = 4000, + Shutdown = infinity, Modules = [tls_connection_sup], Type = supervisor, {Name, StartFunc, Restart, Shutdown, Type, Modules}. |