Merge branch 'ia/ssh/connection-start-error-handling' into maint

* ia/ssh/connection-start-error-handling:
  ssh: Correct error handling of ssh connect

2 files changed, 9 insertions, 32 deletions

diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 85f5f680e6..3395f73884 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -91,10 +91,8 @@ do_connect(Host, Port, SocketOptions, SshOptions, Timeout, DisableIpv6) ->
  	{ok, ConnectionSup} ->
 	    {ok, Manager} = 
 		ssh_connection_sup:connection_manager(ConnectionSup),
-	    MRef = erlang:monitor(process, Manager),
 	    receive 
 		{Manager, is_connected} ->
-		    do_demonitor(MRef, Manager),
 		    {ok, Manager};
 		%% When the connection fails 
 		%% ssh_connection_sup:connection_manager
@@ -102,30 +100,13 @@ do_connect(Host, Port, SocketOptions, SshOptions, Timeout, DisableIpv6) ->
 		%% could allready have terminated, so we will not
 		%% match the Manager in this case
 		{_, not_connected, {error, econnrefused}} when DisableIpv6 == false ->
-		    do_demonitor(MRef, Manager),
 		    do_connect(Host, Port, proplists:delete(inet6, SocketOptions), 
 			    SshOptions, Timeout, true);
 		{_, not_connected, {error, Reason}} ->
-		    do_demonitor(MRef, Manager),
 		    {error, Reason};
 		{_, not_connected, Other} ->
-		    do_demonitor(MRef, Manager),
-		    {error, Other};
-		{'DOWN', MRef, _, Manager, Reason} when is_pid(Manager) ->
-		    error_logger:warning_report([{ssh, connect},
-						 {diagnose,
-						  "Connection was closed before properly set up."},
-						 {host, Host},
-						 {port, Port},
-						 {reason, Reason}]),
-		    receive %% Clear EXIT message from queue
-			{'EXIT', Manager, _What} -> 
-			    {error, channel_closed}
-		    after 0 ->
-			    {error, channel_closed}
-		    end
+		    {error, Other}
 	    after Timeout  ->
-		    do_demonitor(MRef, Manager),
 		    ssh_connection_manager:stop(Manager),
 		    {error, timeout}
 	    end
@@ -134,16 +115,6 @@ do_connect(Host, Port, SocketOptions, SshOptions, Timeout, DisableIpv6) ->
  	    {error, ssh_not_started}
     end.
 
-do_demonitor(MRef, Manager) ->
-    erlang:demonitor(MRef),
-    receive 
-	{'DOWN', MRef, _, Manager, _} -> 
-	    ok
-    after 0 -> 
-	    ok
-    end.
-
-
 %%--------------------------------------------------------------------
 %% Function: close(ConnectionRef) -> ok
 %%
diff --git a/lib/ssh/src/ssh_connection_sup.erl b/lib/ssh/src/ssh_connection_sup.erl
index e3544af1c6..b620056310 100644
--- a/lib/ssh/src/ssh_connection_sup.erl
+++ b/lib/ssh/src/ssh_connection_sup.erl
@@ -48,8 +48,12 @@ start_manager_child(Sup, Args) ->
     supervisor:start_child(Sup, Spec).
 
 connection_manager(SupPid) -> 
-    Children = supervisor:which_children(SupPid),
-    {ok, ssh_connection_manager(Children)}.
+    try supervisor:which_children(SupPid) of
+	Children ->
+	    {ok, ssh_connection_manager(Children)}
+    catch exit:{noproc,_} ->
+	    {ok, undefined}
+    end.
 
 %%%=========================================================================
 %%%  Supervisor callback
@@ -107,6 +111,8 @@ handler_spec([Role, Socket, Opts]) ->
     Type = worker,
     {Name, StartFunc, Restart, Shutdown, Type, Modules}.
 
+ssh_connection_manager([]) ->
+    undefined;
 ssh_connection_manager([{_, Child, _, [ssh_connection_manager]} | _]) ->
     Child;
 ssh_connection_manager([_ | Rest]) ->