diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-04-12 12:41:45 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-04-12 12:41:45 +0100 |
| commit | ce8e794a8b3d6c77d65a14295bfd9bacb15f9929 (patch) | |
| tree | fb2b419c9af5165726c2c227875cae0a621ef6fc | |
| parent | 9f3b55b939b29c46188e7e90937bf8edc204793f (diff) | |
| parent | 1dab90ba8b50902e3da172f05bd73bab95fb90b7 (diff) | |
| download | rabbitmq-server-git-ce8e794a8b3d6c77d65a14295bfd9bacb15f9929.tar.gz | |
merge default into bug21673
| -rw-r--r-- | src/rabbit.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_amqqueue.erl | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index de2fec574c..c84d6de4cb 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -138,8 +138,8 @@ {mfa, {rabbit_exchange, recover, []}}, {requires, empty_db_check}]}). --rabbit_boot_step({message_store_queue_sup_queue_recovery, - [{description, "message store, queue supervisor and queue recovery"}, +-rabbit_boot_step({queue_sup_queue_recovery, + [{description, "queue supervisor and queue recovery"}, {mfa, {rabbit_amqqueue, start, []}}, {requires, empty_db_check}, {enables, routing_ready}]}). diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 87f12df19a..6fe60bba99 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -162,9 +162,9 @@ recover_durable_queues(DurableQueues) -> [] -> false end end) of - true -> [Q|Acc]; - false -> exit(Q#amqqueue.pid, shutdown), - Acc + true -> [Q | Acc]; + false -> exit(Q#amqqueue.pid, shutdown), + Acc end end, [], DurableQueues), %% Issue inits to *all* the queues so that they all init at the same time |