Deal with already_started crypto and ssl conditions.

2008-12-21 00:00:32 +01:00 · 2008-12-21 00:00:32 +01:00 · af7d7dab30
parent 441ef59ec2
commit af7d7dab30
1 changed files with 12 additions and 2 deletions
--- a/deps/amqp_client/src/amqp_network_driver.erl
+++ b/deps/amqp_client/src/amqp_network_driver.erl
@ -49,8 +49,18 @@ handshake(ConnectionState = #connection_state{serverhost = Host, cacertfile=nil,
    end;

 handshake(ConnectionState = #connection_state{serverhost = Host}) ->
-    crypto:start(),
-    ok = ssl:start(),
+    EnsureStarted = fun(App) ->
+            case application:start(App) of
+                ok ->
+                    ok;
+                {error, {already_started, App}} ->
+                    ok;
+                {error, Reason} ->
+                    throw(Reason)
+            end
+    end,
+
+    lists:foreach(EnsureStarted, [crypto, ssl]),

    case gen_tcp:connect(Host, 5673, ?RABBIT_TCP_OPTS) of
        {ok, Sock} ->