diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-11-29 12:33:31 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-11-29 12:33:31 +0000 |
| commit | 7e1fa7f1cbf348eb5d6438ce4c84b4fcf8d0dee3 (patch) | |
| tree | d75b29c0223a0d463e0575b87f613addb7523a01 | |
| parent | fc1506364f8f51d57515011f69bac5453d348066 (diff) | |
| download | rabbitmq-server-git-7e1fa7f1cbf348eb5d6438ce4c84b4fcf8d0dee3.tar.gz | |
Present the whole amqqueue record to the BQ
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_invariable_queue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 87d074c2f6..2ae05300c2 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -150,7 +150,7 @@ code_change(_OldVsn, State, _Extra) -> %%---------------------------------------------------------------------------- declare(Recover, From, - State = #q{q = Q = #amqqueue{name = QName, durable = IsDurable}, + State = #q{q = Q = #amqqueue{durable = IsDurable}, backing_queue = BQ, backing_queue_state = undefined, stats_timer = StatsTimer}) -> case rabbit_amqqueue:internal_declare(Q, Recover) of @@ -162,7 +162,7 @@ declare(Recover, From, ok = rabbit_memory_monitor:register( self(), {rabbit_amqqueue, set_ram_duration_target, [self()]}), - BQS = BQ:init(QName, IsDurable, Recover), + BQS = BQ:init(Q, IsDurable, Recover), State1 = process_args(State#q{backing_queue_state = BQS}), rabbit_event:notify(queue_created, infos(?CREATION_EVENT_KEYS, State1)), diff --git a/src/rabbit_invariable_queue.erl b/src/rabbit_invariable_queue.erl index 5a0532eac1..a2ed13d537 100644 --- a/src/rabbit_invariable_queue.erl +++ b/src/rabbit_invariable_queue.erl @@ -64,7 +64,7 @@ start(DurableQueues) -> stop() -> ok = rabbit_sup:stop_child(rabbit_persister). -init(QName, IsDurable, Recover) -> +init(#amqqueue { name = QName }, IsDurable, Recover) -> Q = queue:from_list(case IsDurable andalso Recover of true -> rabbit_persister:queue_content(QName); false -> [] diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 5ac042a252..dd39a1c266 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -403,7 +403,7 @@ stop_msg_store() -> ok = rabbit_sup:stop_child(?PERSISTENT_MSG_STORE), ok = rabbit_sup:stop_child(?TRANSIENT_MSG_STORE). -init(QueueName, IsDurable, false) -> +init(#amqqueue { name = QueueName }, IsDurable, false) -> IndexState = rabbit_queue_index:init(QueueName), init(IsDurable, IndexState, 0, [], case IsDurable of @@ -412,7 +412,7 @@ init(QueueName, IsDurable, false) -> end, msg_store_client_init(?TRANSIENT_MSG_STORE)); -init(QueueName, true, true) -> +init(#amqqueue { name = QueueName }, true, true) -> Terms = rabbit_queue_index:shutdown_terms(QueueName), {PRef, TRef, Terms1} = case [persistent_ref, transient_ref] -- proplists:get_keys(Terms) of |