diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-06-21 15:41:56 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-06-21 15:41:56 +0100 |
| commit | 240e64eaf4a1f3ff5b190df5abf1008a6ebffa7c (patch) | |
| tree | 5bc4b5b186ffcee234f7a518d240aba9e3fa9f5b | |
| parent | 85953f05729171ae2a6a3285ca0bb63e353d6654 (diff) | |
| parent | 175be28d678dcd6cb8d13afbec632237f76c1144 (diff) | |
| download | rabbitmq-server-240e64eaf4a1f3ff5b190df5abf1008a6ebffa7c.tar.gz | |
Merged bug25638 into stable
| -rw-r--r-- | src/rabbit_amqqueue.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index ef5dd103..767abeb0 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -219,8 +219,10 @@ find_durable_queues() -> %% TODO: use dirty ops instead rabbit_misc:execute_mnesia_transaction( fun () -> - qlc:e(qlc:q([Q || Q = #amqqueue{pid = Pid} + qlc:e(qlc:q([Q || Q = #amqqueue{name = Name, + pid = Pid} <- mnesia:table(rabbit_durable_queue), + mnesia:read(rabbit_queue, Name, read) =:= [], node(Pid) == Node])) end). diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index 4b6c7538..702df040 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -145,7 +145,7 @@ start() -> rabbit_sup:start_supervisor_child( {rabbit_connection_sup,start_link,[]}]). ensure_ssl() -> - ok = app_utils:start_applications([crypto, public_key, ssl]), + ok = app_utils:start_applications([asn1, crypto, public_key, ssl]), {ok, SslOptsConfig} = application:get_env(rabbit, ssl_options), % unknown_ca errors are silently ignored prior to R14B unless we |