aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-03-28 17:20:46 +0200
committerHans Nilsson <[email protected]>2017-04-07 10:23:36 +0200
commit92bdf870ec6509eb958535780b8655206478f7db (patch)
treeadac14dd220b0e4f3f09bd9c90aefdc2b6ff6d0f
parent8f4bb9b0bd3aed663521371726ea3ec460e231a0 (diff)
downloadotp-92bdf870ec6509eb958535780b8655206478f7db.tar.gz
otp-92bdf870ec6509eb958535780b8655206478f7db.tar.bz2
otp-92bdf870ec6509eb958535780b8655206478f7db.zip
ssh: change 'brutal_kill' to timeout'
-rw-r--r--lib/ssh/src/ssh_acceptor_sup.erl2
-rw-r--r--lib/ssh/src/ssh_sup.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_acceptor_sup.erl b/lib/ssh/src/ssh_acceptor_sup.erl
index 3ad842f98c..26defcfdbd 100644
--- a/lib/ssh/src/ssh_acceptor_sup.erl
+++ b/lib/ssh/src/ssh_acceptor_sup.erl
@@ -87,7 +87,7 @@ child_spec(Address, Port, Profile, Options) ->
#{id => id(Address, Port, Profile),
start => {ssh_acceptor, start_link, [Port, Address, Options, Timeout]},
restart => transient,
- shutdown => brutal_kill,
+ shutdown => 5500, %brutal_kill,
type => worker,
modules => [ssh_acceptor]
}.
diff --git a/lib/ssh/src/ssh_sup.erl b/lib/ssh/src/ssh_sup.erl
index 6be809b1bd..26574763e4 100644
--- a/lib/ssh/src/ssh_sup.erl
+++ b/lib/ssh/src/ssh_sup.erl
@@ -39,7 +39,7 @@ init(_) ->
ChildSpecs = [#{id => Module,
start => {Module, start_link, []},
restart => permanent,
- shutdown => brutal_kill,
+ shutdown => 4000, %brutal_kill,
type => supervisor,
modules => [Module]
}