diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-10-13 13:47:30 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-10-13 13:47:30 +0100 |
| commit | 86189f50af06b7a92ef451fb9f49bdbc25550fe8 (patch) | |
| tree | a5a9cf3fcb31dbca0f6468f1014cd17684c5f5c9 /src | |
| parent | 2b0cc92ad344d1e3431b8eae505d3f86d9764902 (diff) | |
| download | rabbitmq-server-git-86189f50af06b7a92ef451fb9f49bdbc25550fe8.tar.gz | |
it starts up again
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 9 | ||||
| -rw-r--r-- | src/rabbit_msg_store.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_queue_index.erl | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 892e3c8ba6..4e027ca824 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -150,15 +150,16 @@ start(normal, []) -> ok = start_child(rabbit_router), ok = start_child(rabbit_node_monitor), ok = start_child(rabbit_guid), - ok = start_child(rabbit_disk_queue) + ok = rabbit_queue_index:start_msg_store() end}, {"recovery", fun () -> ok = maybe_insert_default_data(), ok = rabbit_exchange:recover(), - {ok, DurableQueues} = rabbit_amqqueue:recover(), - ok = rabbit_disk_queue:delete_non_durable_queues( - [ Q #amqqueue.name || Q <- DurableQueues ]) + {ok, _DurableQueues} = rabbit_amqqueue:recover() + %% TODO - don't use disk_queue any more! + %% ok = rabbit_disk_queue:delete_non_durable_queues( + %% [ Q #amqqueue.name || Q <- DurableQueues ]) end}, {"builtin applications", fun () -> diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 2b4bb1f2df..3f2f4cfe60 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -249,6 +249,8 @@ sync() -> gen_server2:pcast(?SERVER, 9, sync). %% internal init([Dir, MsgRefDeltaGen, MsgRefDeltaGenInit]) -> + ok = filelib:ensure_dir(filename:join(Dir, "nothing")), + MsgLocations = ets:new(?MSG_LOC_NAME, [set, private, {keypos, #msg_location.msg_id}]), diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index d34744a395..c0a559e9ec 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -300,7 +300,8 @@ start_msg_store() -> MsgStoreDir = filename:join(rabbit_mnesia:dir(), "msg_store"), {ok, _Pid} = rabbit_msg_store:start_link(MsgStoreDir, fun queue_index_walker/1, - Queues). + Queues), + ok. %%---------------------------------------------------------------------------- %% Minor Helpers |