diff options
author | Erlang/OTP <[email protected]> | 2018-02-21 15:09:46 +0100 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2018-02-21 15:09:46 +0100 |
commit | d42ff869391cea3cec9224077f33cf33f58e41be (patch) | |
tree | 69a89094f3bce2f04fae1b23e953276c3cac13d6 /lib/ssh/src/ssh_sup.erl | |
parent | 309ef748ddc5bde4bcba280ce2739385f27a76e6 (diff) | |
parent | 83cd7724b244a4d5dd3efbdbb66811e781136ac9 (diff) | |
download | otp-d42ff869391cea3cec9224077f33cf33f58e41be.tar.gz otp-d42ff869391cea3cec9224077f33cf33f58e41be.tar.bz2 otp-d42ff869391cea3cec9224077f33cf33f58e41be.zip |
Merge branch 'hans/ssh/supervisor_timeout/OTP-14907' into maint-20
* hans/ssh/supervisor_timeout/OTP-14907:
ssh: Dont repeat supervisor defaults in map fields
ssh: Move starting of channel child to ssh_channel_sup
ssh: Test case for sup tree when shell server proc times out
Diffstat (limited to 'lib/ssh/src/ssh_sup.erl')
-rw-r--r-- | lib/ssh/src/ssh_sup.erl | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/ssh/src/ssh_sup.erl b/lib/ssh/src/ssh_sup.erl index eaec7a54e4..8183016ba5 100644 --- a/lib/ssh/src/ssh_sup.erl +++ b/lib/ssh/src/ssh_sup.erl @@ -36,15 +36,14 @@ init(_) -> intensity => 10, period => 3600 }, - ChildSpecs = [#{id => Module, - start => {Module, start_link, []}, - restart => permanent, - shutdown => 4000, %brutal_kill, - type => supervisor, - modules => [Module] + ChildSpecs = [#{id => sshd_sup, + start => {sshd_sup, start_link, []}, + type => supervisor + }, + #{id => sshc_sup, + start => {sshc_sup, start_link, []}, + type => supervisor } - || Module <- [sshd_sup, - sshc_sup] ], {ok, {SupFlags,ChildSpecs}}. |