aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZandra <[email protected]>2015-11-24 10:39:59 +0100
committerZandra <[email protected]>2015-11-24 10:39:59 +0100
commit517a545d9de0a434c486de1acdc891c6fc8e3309 (patch)
treedfc7731dee40c8515b7efa626cb09d6c3404412e
parentba77723f5d81e9e52fb4e2abdffc70ccd3d3e8de (diff)
parente30f65485aec78c6bd65e25e5a185100b3f8f042 (diff)
downloadotp-517a545d9de0a434c486de1acdc891c6fc8e3309.tar.gz
otp-517a545d9de0a434c486de1acdc891c6fc8e3309.tar.bz2
otp-517a545d9de0a434c486de1acdc891c6fc8e3309.zip
Merge branch 'legoscia/tls-dist-shutdown' into maint
* legoscia/tls-dist-shutdown: Adjust shutdown strategies for distribution over TLS OTP-13134
-rw-r--r--lib/ssl/src/inet_tls_dist.erl2
-rw-r--r--lib/ssl/src/ssl_dist_sup.erl2
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 b6e62a18c9..404ae93d20 100644
--- a/lib/ssl/src/inet_tls_dist.erl
+++ b/lib/ssl/src/inet_tls_dist.erl
@@ -30,7 +30,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 aa1fa57db8..435ad27a44 100644
--- a/lib/ssl/src/ssl_dist_sup.erl
+++ b/lib/ssl/src/ssl_dist_sup.erl
@@ -70,7 +70,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}.