diff options
| author | Ingela Anderton Andin <[email protected]> | 2013-11-27 08:16:45 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2013-11-27 08:16:45 +0100 |
| commit | 22e2b396e2fabe27c5a74843495c3eaf6900e211 (patch) | |
| tree | 34fd7872933587f6c50e574a669ca96aa2687357 /lib/ssh/src/ssh_acceptor_sup.erl | |
| parent | 8852c947d413e8814d663c9319f7b8932b05a7ad (diff) | |
| parent | e4653d52abd98628fb862a8b01ea804473bdb338 (diff) | |
| download | otp-22e2b396e2fabe27c5a74843495c3eaf6900e211.tar.gz otp-22e2b396e2fabe27c5a74843495c3eaf6900e211.tar.bz2 otp-22e2b396e2fabe27c5a74843495c3eaf6900e211.zip | |
Merge branch 'ia/ssh/close/OTP-11363' into maint
* ia/ssh/close/OTP-11363:
ssh: Correct close handling
Diffstat (limited to 'lib/ssh/src/ssh_acceptor_sup.erl')
| -rw-r--r-- | lib/ssh/src/ssh_acceptor_sup.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh_acceptor_sup.erl b/lib/ssh/src/ssh_acceptor_sup.erl index f37e1fe4ff..2be729d305 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-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 @@ -84,8 +84,8 @@ child_spec(ServerOpts) -> [{active, false}, {reuseaddr, true}] ++ SocketOpts, ServerOpts, Timeout]}, - Restart = permanent, - Shutdown = 3600, + Restart = transient, + Shutdown = brutal_kill, Modules = [ssh_acceptor], Type = worker, {Name, StartFunc, Restart, Shutdown, Type, Modules}. |