summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEssien Ita Essien <essiene@gmail.com>2008-12-26 13:13:25 +0100
committerEssien Ita Essien <essiene@gmail.com>2008-12-26 13:13:25 +0100
commit8efbbc562da10f38759d0c382432b79e5699fea8 (patch)
treeaa68112a80a2b091d55bf992679bd8c0cb2e04ed /src
parenta077f8415e7be19bf290e7e87da100e247b6abab (diff)
downloadrabbitmq-server-git-8efbbc562da10f38759d0c382432b79e5699fea8.tar.gz
Change the way that ssl_listeners option is specified.
I have added an empty list of ssl_listners into the application environment by default, which will now need to be overriden by config options, perfarably in /etc/default/rabbitmq Also, make ssl app to be started ONLY when there are valid ssl listeners configured
Diffstat (limited to 'src')
-rw-r--r--src/rabbit.erl9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 6891fe736f..81685529e0 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -48,7 +48,7 @@
-include("rabbit_framing.hrl").
-include("rabbit.hrl").
--define(APPS, [os_mon, mnesia, crypto, ssl, rabbit]).
+-define(APPS, [os_mon, mnesia, crypto, rabbit]).
%%----------------------------------------------------------------------------
@@ -202,6 +202,13 @@ start(normal, []) ->
{"SSL listeners",
fun () ->
{ok, SSLListeners} = application:get_env(ssl_listeners),
+ case length(SSLListeners) of
+ 0 ->
+ continue;
+ _Len ->
+ ok = start_applications([ssl])
+ end,
+
lists:foreach(
fun ({Host, Port}) ->
ok = rabbit_networking:start_ssl_listener(Host, Port)