diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-11-22 14:54:43 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-11-26 12:24:25 +0100 |
| commit | e4653d52abd98628fb862a8b01ea804473bdb338 (patch) | |
| tree | aa4263814d11aeca186f07ac4fc9485afcb9fa6f /lib/ssh/src/sshd_sup.erl | |
| parent | 90c8450bb691a7b57ce326fddd1f44ef01db390f (diff) | |
| download | otp-e4653d52abd98628fb862a8b01ea804473bdb338.tar.gz otp-e4653d52abd98628fb862a8b01ea804473bdb338.tar.bz2 otp-e4653d52abd98628fb862a8b01ea804473bdb338.zip | |
ssh: Correct close handling
Commit 68263a48bfbdac4dc219a91f06af3d535d881850 got close handling
slightly wrong, channels did not get their close message.
Commit 32102f1e8225dada7526c9bfee6622f9026ba4cd did not work as expected
Diffstat (limited to 'lib/ssh/src/sshd_sup.erl')
| -rw-r--r-- | lib/ssh/src/sshd_sup.erl | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/ssh/src/sshd_sup.erl b/lib/ssh/src/sshd_sup.erl index 747906b2cf..60222f5172 100644 --- a/lib/ssh/src/sshd_sup.erl +++ b/lib/ssh/src/sshd_sup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2013. 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 @@ -58,12 +58,7 @@ start_child(ServerOpts) -> end. stop_child(Name) -> - case supervisor:terminate_child(?MODULE, Name) of - ok -> - supervisor:delete_child(?MODULE, Name); - Error -> - Error - end. + supervisor:terminate_child(?MODULE, Name). stop_child(Address, Port) -> Name = id(Address, Port), @@ -94,7 +89,7 @@ init([Servers]) -> child_spec(Address, Port, ServerOpts) -> Name = id(Address, Port), StartFunc = {ssh_system_sup, start_link, [ServerOpts]}, - Restart = transient, + Restart = temporary, Shutdown = infinity, Modules = [ssh_system_sup], Type = supervisor, |