diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-28 12:25:57 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-28 12:25:57 +0100 |
| commit | 9637395a6117cf7ed626280de5b5fb723e89b109 (patch) | |
| tree | 642ba70db2bd1147a6ac9683a489d7a2535e0986 | |
| parent | 03f6fafc836faec6a63fac992f7616374b80bc59 (diff) | |
| parent | 661cbcfd65cc609ce6123d7d202e2e571df09817 (diff) | |
| download | rabbitmq-server-git-9637395a6117cf7ed626280de5b5fb723e89b109.tar.gz | |
Merging default into bug 21673
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 4 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index b0eb09ebc1..5e2668c1a6 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -724,10 +724,6 @@ <listitem><para>Number of consumers.</para></listitem> </varlistentry> <varlistentry> - <term>transactions</term> - <listitem><para>Number of transactions.</para></listitem> - </varlistentry> - <varlistentry> <term>memory</term> <listitem><para>Bytes of memory consumed by the Erlang process associated with the queue, including stack, heap and internal structures.</para></listitem> diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 2eaf8b7e29..c18caae4b0 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -87,7 +87,6 @@ messages_unacknowledged, messages, consumers, - transactions, memory, backing_queue_status ]). @@ -508,8 +507,6 @@ i(messages, State) -> messages_unacknowledged]]); i(consumers, State) -> queue:len(State#q.active_consumers) + queue:len(State#q.blocked_consumers); -i(transactions, _) -> - length([ok || #cr{txn = Txn} <- all_ch_record(), Txn =/= none]); i(memory, _) -> {memory, M} = process_info(self(), memory), M; |