From 92bdf870ec6509eb958535780b8655206478f7db Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Tue, 28 Mar 2017 17:20:46 +0200 Subject: ssh: change 'brutal_kill' to timeout' --- lib/ssh/src/ssh_acceptor_sup.erl | 2 +- lib/ssh/src/ssh_sup.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') 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] } -- cgit v1.2.3