From 32102f1e8225dada7526c9bfee6622f9026ba4cd Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 12 Nov 2013 16:57:29 +0100
Subject: ssh: Quicker shutdown of an ssh dameon

OTP-11339
---
 lib/ssh/src/ssh_system_sup.erl | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'lib/ssh/src')

diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index 158a829eb0..bf3c12a988 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -55,13 +55,12 @@ stop_listener(Address, Port) ->
     Name = make_name(Address, Port),
     stop_acceptor(whereis(Name)). 
 
-stop_system(SysSup) ->
-    Name = sshd_sup:system_name(SysSup),
-    sshd_sup:stop_child(Name).
-    
-stop_system(Address, Port) -> 
-    sshd_sup:stop_child(Address, Port).
+stop_system(SysSup) when is_pid(SysSup)->
+    exit(SysSup, shutdown).
 
+stop_system(Address, Port) -> 
+    stop_system(system_supervisor(Address, Port)).
+    
 system_supervisor(Address, Port) ->
     Name = make_name(Address, Port),
     whereis(Name).
@@ -121,7 +120,7 @@ restart_acceptor(Address, Port) ->
 %%%=========================================================================
 init([ServerOpts]) ->
     RestartStrategy = one_for_one,
-    MaxR = 10,
+    MaxR = 0,
     MaxT = 3600,
     Children = child_specs(ServerOpts),
     {ok, {{RestartStrategy, MaxR, MaxT}, Children}}.
-- 
cgit v1.2.3