Merged with upstream

1 files changed, 18 insertions, 0 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index 7f808bc9..c513ddd7 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -171,6 +171,24 @@ start(normal, []) ->
                           ok = rabbit_networking:start_tcp_listener(Host, Port)
                   end,
                   TCPListeners)
+        end},
+       {"SSL listeners",
+        fun () ->
+                {ok, SSLListeners} = application:get_env(ssl_listeners),
+                case length(SSLListeners) of
+                    0 ->
+                        ok;
+                    _Len ->
+                        ok = rabbit_misc:start_applications([crypto, ssl]),
+
+                        {ok, SslOpts} = application:get_env(ssl_options),
+
+                        lists:foreach(
+                          fun ({Host, Port}) ->
+                                  ok = rabbit_networking:start_ssl_listener(Host, Port, SslOpts)
+                          end,
+                          SSLListeners)
+                end
         end}]
       ++ ExtraSteps),