diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-09 16:25:00 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-09 16:25:00 +0100 |
| commit | c734759488c352befb472d2dace5f30a31e6f86d (patch) | |
| tree | a0da46dd9c1d96d83276d079f0339a48b2a98da0 /src | |
| parent | aa49051b35b5bdf14c046f815dbf7db04b531a84 (diff) | |
| download | rabbitmq-server-git-c734759488c352befb472d2dace5f30a31e6f86d.tar.gz | |
Startup only requires durable queue names, not the whole amqqueue record
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_backing_queue_type.erl | 10 | ||||
| -rw-r--r-- | src/rabbit_queue_index.erl | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 7a18eb4b67..6e6b4c676f 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -126,7 +126,7 @@ start() -> DurableQueues = find_durable_queues(), {ok, BQ} = application:get_env(backing_queue_module), - ok = BQ:start(DurableQueues), + ok = BQ:start([QName || #amqqueue{name = QName} <- DurableQueues]), {ok,_} = supervisor:start_child( rabbit_sup, {rabbit_amqqueue_sup, diff --git a/src/rabbit_backing_queue_type.erl b/src/rabbit_backing_queue_type.erl index b00d351b84..c484a7c255 100644 --- a/src/rabbit_backing_queue_type.erl +++ b/src/rabbit_backing_queue_type.erl @@ -35,11 +35,11 @@ behaviour_info(callbacks) -> [ - %% Called on startup with a list of durable queues. The queues - %% aren't being started at this point, but this call allows the - %% backing queue to perform any checking necessary for the - %% consistency of those queues, or initialise any other shared - %% resources. + %% Called on startup with a list of durable queue names. The + %% queues aren't being started at this point, but this call + %% allows the backing queue to perform any checking necessary for + %% the consistency of those queues, or initialise any other + %% shared resources. {start, 1}, %% Called with queue name and a boolean to indicate whether or diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl index f7f265afe2..aaef03afb2 100644 --- a/src/rabbit_queue_index.erl +++ b/src/rabbit_queue_index.erl @@ -435,8 +435,8 @@ start_msg_stores(DurableQueues) -> [?TRANSIENT_MSG_STORE, rabbit_mnesia:dir(), undefined, fun (ok) -> finished end, ok]), DurableDict = - dict:from_list([ {queue_name_to_dir_name(Queue #amqqueue.name), - Queue #amqqueue.name} || Queue <- DurableQueues ]), + dict:from_list([ {queue_name_to_dir_name(Queue), Queue} || + Queue <- DurableQueues ]), QueuesDir = queues_dir(), Directories = case file:list_dir(QueuesDir) of {ok, Entries} -> |