Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kuba/ssh/no system sup for client/gh 7550 #8766

Merged
merged 5 commits into from
Sep 23, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ssh: remove unused Address from function arguments
  • Loading branch information
u3s committed Sep 19, 2024
commit 412e268070e8ef90af90129c226288522ad33a3c
8 changes: 4 additions & 4 deletions lib/ssh/src/ssh_connection_handler.erl
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@
%%====================================================================

%%% Start and stop
-export([start_link/4, start_link/5,
-export([start_link/3, start_link/4,
takeover/4,
stop/1
]).
@@ -99,10 +99,10 @@
%% Start / stop
%%====================================================================

start_link(Role, Address, Socket, Options) ->
start_link(Role, Address, undefined, Socket, Options).
start_link(Role, Socket, Options) ->
start_link(Role, undefined, Socket, Options).

start_link(Role, _Address=#address{}, Id, Socket, Options) ->
start_link(Role, Id, Socket, Options) ->
case gen_statem:start_link(?MODULE,
[Role, Socket, Options],
[{spawn_opt, [{message_queue_data,off_heap}]}]) of
10 changes: 5 additions & 5 deletions lib/ssh/src/ssh_subsystem_sup.erl
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@

-include("ssh.hrl").

-export([start_link/5,
-export([start_link/4,
start_channel/8,
tcpip_fwd_supervisor/1
]).
@@ -40,8 +40,8 @@
%%%=========================================================================
%%% API
%%%=========================================================================
start_link(Role, Address=#address{}, Id, Socket, Options) ->
case supervisor:start_link(?MODULE, [Role, Address, Id, Socket, Options]) of
start_link(Role, Id, Socket, Options) ->
case supervisor:start_link(?MODULE, [Role, Id, Socket, Options]) of
{error, {shutdown, {failed_to_start_child, _, Error}}} ->
{error,Error};
Other ->
@@ -59,7 +59,7 @@ tcpip_fwd_supervisor(SubSysSup) ->
%%%=========================================================================
%%% Supervisor callback
%%%=========================================================================
init([Role, Address, Id, Socket, Options]) ->
init([Role, Id, Socket, Options]) ->
ssh_lib:set_label(Role, {subsystem_sup, Socket}),
SubSysSup = self(),
SupFlags = #{strategy => one_for_all,
@@ -73,7 +73,7 @@ init([Role, Address, Id, Socket, Options]) ->
significant => true,
start => {ssh_connection_handler,
start_link,
[Role, Address, Id, Socket,
[Role, Id, Socket,
?PUT_INTERNAL_OPT([
{subsystem_sup, SubSysSup}
], Options)
2 changes: 1 addition & 1 deletion lib/ssh/src/ssh_system_sup.erl
Original file line number Diff line number Diff line change
@@ -105,7 +105,7 @@ start_subsystem(Role, Address=#address{}, Socket, Options0) ->
case supervisor:start_child(SysPid,
#{id => Id,
start => {ssh_subsystem_sup, start_link,
[Role,Address,Id,Socket,Options]
[Role,Id,Socket,Options]
},
restart => temporary,
significant => true,