diff options
| author | Erlang/OTP <[email protected]> | 2016-08-04 16:09:03 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-08-04 16:09:03 +0200 |
| commit | 8ec225e35702933de417df4e77f09415e30df50b (patch) | |
| tree | 3a4f5b6435389289d8de5d0f80763245c76766ef /lib | |
| parent | f5ef4087331c0181fd154dcaa372a05e6f8bd408 (diff) | |
| parent | d732b4b8abfe59d1ac5ec475633ca08501341a49 (diff) | |
| download | otp-8ec225e35702933de417df4e77f09415e30df50b.tar.gz otp-8ec225e35702933de417df4e77f09415e30df50b.tar.bz2 otp-8ec225e35702933de417df4e77f09415e30df50b.zip | |
Merge branch 'hans/ssh/sup_fix_ssh_supc_type/OTP-13782' into maint-18
* hans/ssh/sup_fix_ssh_supc_type/OTP-13782:
ssh: update test suite for supervisors
ssh: sshc_sup to use worker for ssh_con_handler
ssh: update version number
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssh/src/sshc_sup.erl | 4 | ||||
| -rw-r--r-- | lib/ssh/test/ssh_sup_SUITE.erl | 8 | ||||
| -rw-r--r-- | lib/ssh/vsn.mk | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/ssh/src/sshc_sup.erl b/lib/ssh/src/sshc_sup.erl index 8ee6aacfb5..b8275ba1eb 100644 --- a/lib/ssh/src/sshc_sup.erl +++ b/lib/ssh/src/sshc_sup.erl @@ -64,7 +64,7 @@ child_spec(_) -> Name = undefined, % As simple_one_for_one is used. StartFunc = {ssh_connection_handler, start_link, []}, Restart = temporary, - Shutdown = infinity, + Shutdown = 4000, Modules = [ssh_connection_handler], - Type = supervisor, + Type = worker, {Name, StartFunc, Restart, Shutdown, Type, Modules}. diff --git a/lib/ssh/test/ssh_sup_SUITE.erl b/lib/ssh/test/ssh_sup_SUITE.erl index 18e91a9af3..98441e0046 100644 --- a/lib/ssh/test/ssh_sup_SUITE.erl +++ b/lib/ssh/test/ssh_sup_SUITE.erl @@ -105,16 +105,16 @@ sshc_subtree(Config) when is_list(Config) -> {ok, Pid1} = ssh:connect(Host, Port, [{silently_accept_hosts, true}, {user_interaction, false}, {user, ?USER}, {password, ?PASSWD},{user_dir, UserDir}]), - [{_, _,supervisor,[ssh_connection_handler]}] = + [{_, _,worker,[ssh_connection_handler]}] = supervisor:which_children(sshc_sup), {ok, Pid2} = ssh:connect(Host, Port, [{silently_accept_hosts, true}, {user_interaction, false}, {user, ?USER}, {password, ?PASSWD}, {user_dir, UserDir}]), - [{_,_,supervisor,[ssh_connection_handler]}, - {_,_,supervisor,[ssh_connection_handler]}] = + [{_,_,worker,[ssh_connection_handler]}, + {_,_,worker,[ssh_connection_handler]}] = supervisor:which_children(sshc_sup), ssh:close(Pid1), - [{_,_,supervisor,[ssh_connection_handler]}] = + [{_,_,worker,[ssh_connection_handler]}] = supervisor:which_children(sshc_sup), ssh:close(Pid2), ct:sleep(?WAIT_FOR_SHUTDOWN), diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index dc5e7092f8..c62faf8357 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,5 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 4.2.2.1 +SSH_VSN = 4.2.2.2 APP_VSN = "ssh-$(SSH_VSN)" |