diff options
| author | Hans Nilsson <[email protected]> | 2018-04-25 15:51:03 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-04-27 10:30:25 +0200 |
| commit | 8b50978cdc82d404f68384e1aadf7685a9d86af4 (patch) | |
| tree | f2c9b6f1942c4baaea7f783079152526639f52b0 /lib/ssh/src/ssh_connection.erl | |
| parent | 867e9db15f3d3e5e430e3adda577364e455b9dac (diff) | |
| download | otp-8b50978cdc82d404f68384e1aadf7685a9d86af4.tar.gz otp-8b50978cdc82d404f68384e1aadf7685a9d86af4.tar.bz2 otp-8b50978cdc82d404f68384e1aadf7685a9d86af4.zip | |
ssh: Use ssh_daemon_channel_sup and ssh_damon_channel
Diffstat (limited to 'lib/ssh/src/ssh_connection.erl')
| -rw-r--r-- | lib/ssh/src/ssh_connection.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl index 2261d37d6a..0a07ea778d 100644 --- a/lib/ssh/src/ssh_connection.erl +++ b/lib/ssh/src/ssh_connection.erl @@ -822,14 +822,14 @@ start_channel(Cb, Id, Args, SubSysSup, Exec, Opts) -> ChannelSup = ssh_subsystem_sup:channel_supervisor(SubSysSup), case max_num_channels_not_exceeded(ChannelSup, Opts) of true -> - ssh_channel_sup:start_child(ChannelSup, Cb, Id, Args, Exec); + ssh_daemon_channel_sup:start_child(ChannelSup, Cb, Id, Args, Exec); false -> throw(max_num_channels_exceeded) end. max_num_channels_not_exceeded(ChannelSup, Opts) -> MaxNumChannels = ?GET_OPT(max_channels, Opts), - NumChannels = length([x || {_,_,worker,[ssh_channel]} <- + NumChannels = length([x || {_,_,worker,[ssh_daemon_channel]} <- supervisor:which_children(ChannelSup)]), %% Note that NumChannels is BEFORE starting a new one NumChannels < MaxNumChannels. |