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_channel_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_channel_sup.erl')
| -rw-r--r-- | lib/ssh/src/ssh_channel_sup.erl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_channel_sup.erl b/lib/ssh/src/ssh_channel_sup.erl index 6b01dc334d..8444533fd1 100644 --- a/lib/ssh/src/ssh_channel_sup.erl +++ b/lib/ssh/src/ssh_channel_sup.erl @@ -26,7 +26,7 @@ -behaviour(supervisor). --export([start_link/1, start_child/2]). +-export([start_link/1, start_child/5]). %% Supervisor callback -export([init/1]). @@ -37,7 +37,14 @@ start_link(Args) -> supervisor:start_link(?MODULE, [Args]). -start_child(Sup, ChildSpec) -> +start_child(Sup, Callback, Id, Args, Exec) -> + ChildSpec = + #{id => make_ref(), + start => {ssh_channel, start_link, [self(), Id, Callback, Args, Exec]}, + restart => temporary, + type => worker, + modules => [ssh_channel] + }, supervisor:start_child(Sup, ChildSpec). %%%========================================================================= |