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_system_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_system_sup.erl')
| -rw-r--r-- | lib/ssh/src/ssh_system_sup.erl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl index e70abf59c2..17f990c5d8 100644 --- a/lib/ssh/src/ssh_system_sup.erl +++ b/lib/ssh/src/ssh_system_sup.erl @@ -63,9 +63,7 @@ init([Address, Port, Profile, Options]) -> [#{id => id(ssh_acceptor_sup, Address, Port, Profile), start => {ssh_acceptor_sup, start_link, [Address, Port, Profile, Options]}, restart => transient, - shutdown => infinity, - type => supervisor, - modules => [ssh_acceptor_sup] + type => supervisor }]; _ -> [] @@ -124,9 +122,8 @@ start_subsystem(SystemSup, Role, Address, Port, Profile, Options) -> #{id => make_ref(), start => {ssh_subsystem_sup, start_link, [Role, Address, Port, Profile, Options]}, restart => temporary, - shutdown => infinity, - type => supervisor, - modules => [ssh_subsystem_sup]}, + type => supervisor + }, supervisor:start_child(SystemSup, SubsystemSpec). stop_subsystem(SystemSup, SubSys) -> |