diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-04-28 19:56:49 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-04-28 19:56:49 +0100 |
| commit | 4eeddb1baa2972febb90af36e2a1f6a92b981b46 (patch) | |
| tree | e8b4bb467ab643e36e44275d91e0ae3df15932dc /src | |
| parent | b1f3aad647a7e7c0bcc522430a0acdaec9041921 (diff) | |
| parent | 086ed666442fe4be31fc4b965f0f6d54b2f8647c (diff) | |
| download | rabbitmq-server-git-4eeddb1baa2972febb90af36e2a1f6a92b981b46.tar.gz | |
merge default into bug22616
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 17 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 2 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 5e325794af..82e3e05ef3 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -80,11 +80,8 @@ exclusive_consumer_tag, messages_ready, messages_unacknowledged, - messages_uncommitted, messages, - acks_uncommitted, consumers, - transactions, memory]). %%---------------------------------------------------------------------------- @@ -445,9 +442,6 @@ store_tx(Txn, Tx) -> erase_tx(Txn) -> erase({txn, Txn}). -all_tx_record() -> - [T || {{txn, _}, T} <- get()]. - all_tx() -> [Txn || {{txn, Txn}, _} <- get()]. @@ -521,20 +515,11 @@ i(messages_ready, #q{message_buffer = MessageBuffer}) -> i(messages_unacknowledged, _) -> lists:sum([dict:size(UAM) || #cr{unacked_messages = UAM} <- all_ch_record()]); -i(messages_uncommitted, _) -> - lists:sum([length(Pending) || - #tx{pending_messages = Pending} <- all_tx_record()]); i(messages, State) -> lists:sum([i(Item, State) || Item <- [messages_ready, - messages_unacknowledged, - messages_uncommitted]]); -i(acks_uncommitted, _) -> - lists:sum([length(Pending) || - #tx{pending_acks = Pending} <- all_tx_record()]); + messages_unacknowledged]]); i(consumers, State) -> queue:len(State#q.active_consumers) + queue:len(State#q.blocked_consumers); -i(transactions, _) -> - length(all_tx_record()); i(memory, _) -> {memory, M} = process_info(self(), memory), M; diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 1cfba00eb2..6f52dd7c08 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -382,7 +382,7 @@ add_binding(ExchangeName, QueueName, RoutingKey, Arguments) -> if Q#amqqueue.durable and not(X#exchange.durable) -> {error, durability_settings_incompatible}; true -> - case mnesia:read(rabbit_route, B) of + case mnesia:read({rabbit_route, B}) of [] -> sync_binding(B, Q#amqqueue.durable, fun mnesia:write/3), |