diff options
| author | Matthias Radestock <matthias@lshift.net> | 2009-08-28 05:00:23 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2009-08-28 05:00:23 +0100 |
| commit | 8b4a191b64db2d0de4d5cc19a9aecd337e0e5441 (patch) | |
| tree | 05927e4378448f43dc575f9cb64d998134acbbfb /src/rabbit.erl | |
| parent | 1e4be9b8114a89fc8fb88b5eac349fc6575dacc2 (diff) | |
| parent | e0c502266bdb5f0e7d6de05cae0a731c76983bc0 (diff) | |
| download | rabbitmq-server-git-8b4a191b64db2d0de4d5cc19a9aecd337e0e5441.tar.gz | |
merge default into bug21368
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index f665ad92af..71b10913fc 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -135,15 +135,15 @@ start(normal, []) -> ok = start_child(rabbit_log), ok = rabbit_hooks:start(), - ok = rabbit_amqqueue:start(), + ok = rabbit_binary_generator: + check_empty_content_body_frame_size(), {ok, MemoryAlarms} = application:get_env(memory_alarms), ok = rabbit_alarm:start(MemoryAlarms), ok = start_child(rabbit_memory_manager), - ok = rabbit_binary_generator: - check_empty_content_body_frame_size(), + ok = rabbit_amqqueue:start(), ok = start_child(rabbit_router), ok = start_child(rabbit_node_monitor) @@ -176,12 +176,27 @@ start(normal, []) -> {"TCP listeners", fun () -> ok = rabbit_networking:start(), - {ok, TCPListeners} = application:get_env(tcp_listeners), + {ok, TcpListeners} = application:get_env(tcp_listeners), lists:foreach( fun ({Host, Port}) -> ok = rabbit_networking:start_tcp_listener(Host, Port) end, - TCPListeners) + TcpListeners) + end}, + {"SSL listeners", + fun () -> + case application:get_env(ssl_listeners) of + {ok, []} -> + ok; + {ok, SslListeners} -> + ok = rabbit_misc:start_applications([crypto, ssl]), + + {ok, SslOpts} = application:get_env(ssl_options), + + [rabbit_networking:start_ssl_listener + (Host, Port, SslOpts) || {Host, Port} <- SslListeners], + ok + end end}] ++ ExtraSteps), |