diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-09-17 17:04:34 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-09-25 20:03:06 +0200 |
| commit | 19aa8b2e1e11f1da4723dbcce427831eca17d54e (patch) | |
| tree | f5695a31cfa36daaaa7ec34691d1d24fabbf259c /lib/ssh/src/ssh_acceptor_sup.erl | |
| parent | 828b5a03825e168d19715ed65876008b9fc00c39 (diff) | |
| download | otp-19aa8b2e1e11f1da4723dbcce427831eca17d54e.tar.gz otp-19aa8b2e1e11f1da4723dbcce427831eca17d54e.tar.bz2 otp-19aa8b2e1e11f1da4723dbcce427831eca17d54e.zip | |
ssh: Adjust supervisor tree to make sure new listning
options are honored
Diffstat (limited to 'lib/ssh/src/ssh_acceptor_sup.erl')
| -rw-r--r-- | lib/ssh/src/ssh_acceptor_sup.erl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/ssh/src/ssh_acceptor_sup.erl b/lib/ssh/src/ssh_acceptor_sup.erl index 2be729d305..46fdef07d0 100644 --- a/lib/ssh/src/ssh_acceptor_sup.erl +++ b/lib/ssh/src/ssh_acceptor_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2013. All Rights Reserved. +%% Copyright Ericsson AB 2008-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -26,7 +26,7 @@ -module(ssh_acceptor_sup). -behaviour(supervisor). --export([start_link/1, start_child/2, stop_child/2]). +-export([start_link/1, start_child/2, stop_child/3]). %% Supervisor callback -export([init/1]). @@ -45,18 +45,17 @@ start_child(AccSup, ServerOpts) -> {error, already_present} -> Address = proplists:get_value(address, ServerOpts), Port = proplists:get_value(port, ServerOpts), - Name = id(Address, Port), - supervisor:delete_child(?MODULE, Name), + stop_child(AccSup, Address, Port), supervisor:start_child(AccSup, Spec); Reply -> Reply end. -stop_child(Address, Port) -> +stop_child(AccSup, Address, Port) -> Name = id(Address, Port), - case supervisor:terminate_child(?MODULE, Name) of + case supervisor:terminate_child(AccSup, Name) of ok -> - supervisor:delete_child(?MODULE, Name); + supervisor:delete_child(AccSup, Name); Error -> Error end. |