summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2008-11-12 23:33:31 +0000
committerMatthias Radestock <matthias@lshift.net>2008-11-12 23:33:31 +0000
commit05e8da946fae7154c97a2b19b1d1b0bdf7207c3a (patch)
treeedc8f97755f731de170c596b9cc76bb68b5c74b5
parentc2b34a010ea02ca7e20da6b55bb9404251a44070 (diff)
downloadrabbitmq-server-05e8da946fae7154c97a2b19b1d1b0bdf7207c3a.tar.gz
cosmetic rename
for consistency with code in rabbit_exchange
-rw-r--r--src/rabbit_amqqueue_process.erl39
1 files changed, 17 insertions, 22 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 11573ef2..a9addd52 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -476,42 +476,37 @@ purge_message_buffer(QName, MessageBuffer) ->
%% artifically ack them.
persist_acks(none, QName, lists:append(Messages)).
-infos(Items, State) -> [{Item, info(Item, State)} || Item <- Items].
-
-info(name, #q{q = #amqqueue{name = Name}}) ->
- Name;
-info(durable, #q{q = #amqqueue{durable = Durable}}) ->
- Durable;
-info(auto_delete, #q{q = #amqqueue{auto_delete = AutoDelete}}) ->
- AutoDelete;
-info(arguments, #q{q = #amqqueue{arguments = Arguments}}) ->
- Arguments;
-info(pid, #q{q = #amqqueue{pid = Pid}}) ->
- Pid;
-info(messages_ready, #q{message_buffer = MessageBuffer}) ->
+infos(Items, State) -> [{Item, i(Item, State)} || Item <- Items].
+
+i(name, #q{q = #amqqueue{name = Name}}) -> Name;
+i(durable, #q{q = #amqqueue{durable = Durable}}) -> Durable;
+i(auto_delete, #q{q = #amqqueue{auto_delete = AutoDelete}}) -> AutoDelete;
+i(arguments, #q{q = #amqqueue{arguments = Arguments}}) -> Arguments;
+i(pid, #q{q = #amqqueue{pid = Pid}}) -> Pid;
+i(messages_ready, #q{message_buffer = MessageBuffer}) ->
queue:len(MessageBuffer);
-info(messages_unacknowledged, _) ->
+i(messages_unacknowledged, _) ->
lists:sum([dict:size(UAM) ||
#cr{unacked_messages = UAM} <- all_ch_record()]);
-info(messages_uncommitted, _) ->
+i(messages_uncommitted, _) ->
lists:sum([length(Pending) ||
#tx{pending_messages = Pending} <- all_tx_record()]);
-info(messages, State) ->
- lists:sum([info(Item, State) || Item <- [messages_ready,
+i(messages, State) ->
+ lists:sum([i(Item, State) || Item <- [messages_ready,
messages_unacknowledged,
messages_uncommitted]]);
-info(acks_uncommitted, _) ->
+i(acks_uncommitted, _) ->
lists:sum([length(Pending) ||
#tx{pending_acks = Pending} <- all_tx_record()]);
-info(consumers, _) ->
+i(consumers, _) ->
lists:sum([length(Consumers) ||
#cr{consumers = Consumers} <- all_ch_record()]);
-info(transactions, _) ->
+i(transactions, _) ->
length(all_tx_record());
-info(memory, _) ->
+i(memory, _) ->
{memory, M} = process_info(self(), memory),
M;
-info(Item, _) ->
+i(Item, _) ->
throw({bad_argument, Item}).
%---------------------------------------------------------------------------