diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-12-20 19:04:58 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-12-20 19:04:58 +0000 |
| commit | 95f466aa10e9ae29bf0d8b6b3f81846bb55bfbd0 (patch) | |
| tree | 54d9fe9d64ea6befe46051e0f7b3de145ca1f242 /src/rabbit.erl | |
| parent | 1e2f77364d773a726d775b1a5b76cd599e32e6af (diff) | |
| parent | 57baa1db68397e308c57a738a29ec136065eee8c (diff) | |
| download | rabbitmq-server-git-95f466aa10e9ae29bf0d8b6b3f81846bb55bfbd0.tar.gz | |
merged bug 22161 into bug 21673. Lazy, concurrent msg_store GC landed.
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 2aa58fc02a..fe1be7c292 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -150,12 +150,11 @@ start(normal, []) -> start_child(vm_memory_monitor, [MemoryWatermark]) end, - ok = rabbit_amqqueue:start(), + ok = start_child(rabbit_memory_monitor), + ok = start_child(rabbit_guid), ok = start_child(rabbit_router), - ok = start_child(rabbit_guid), - ok = start_child(rabbit_node_monitor), - ok = start_child(rabbit_memory_monitor) + ok = start_child(rabbit_node_monitor) end}, {"recovery", fun () -> @@ -163,6 +162,9 @@ start(normal, []) -> ok = rabbit_exchange:recover(), DurableQueues = rabbit_amqqueue:find_durable_queues(), ok = rabbit_queue_index:start_msg_store(DurableQueues), + + ok = rabbit_amqqueue:start(), + {ok, _RealDurableQueues} = rabbit_amqqueue:recover(DurableQueues) %% TODO - RealDurableQueues is a subset of %% DurableQueues. It may have queues removed which |