diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-03-06 14:34:12 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-03-06 14:34:12 +0000 |
| commit | 22873bc8e09e73c9cd95204b09f5d554d94d9032 (patch) | |
| tree | 6d3a29e01de76a64506657ffb48fac40a93a9804 | |
| parent | 5f53cd7b8c0b40c1da3bb31ad9acd5723b645996 (diff) | |
| download | rabbitmq-server-git-22873bc8e09e73c9cd95204b09f5d554d94d9032.tar.gz | |
Rename info items
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 6 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index bd4563fcd4..01b024a235 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -1574,7 +1574,11 @@ </varlistentry> <varlistentry> <term>prefetch_count</term> - <listitem><para>QoS prefetch count limit in force, 0 if unlimited.</para></listitem> + <listitem><para>QoS prefetch limit for new consumers, 0 if unlimited.</para></listitem> + </varlistentry> + <varlistentry> + <term>global_prefetch_count</term> + <listitem><para>QoS prefetch limit for the entire channel, 0 if unlimited.</para></listitem> </varlistentry> </variablelist> <para> diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 6421a7655f..2a6b01f7d3 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -53,7 +53,7 @@ messages_uncommitted, acks_uncommitted, prefetch_count, - consumer_prefetch_count, + global_prefetch_count, state]). -define(CREATION_EVENT_KEYS, @@ -1611,8 +1611,8 @@ i(acks_uncommitted, #ch{tx = {_Msgs, Acks}}) -> ack_len(Acks); i(acks_uncommitted, #ch{}) -> 0; i(state, #ch{state = running}) -> credit_flow:state(); i(state, #ch{state = State}) -> State; -i(consumer_prefetch_count, #ch{consumer_prefetch = C}) -> C; -i(prefetch_count, #ch{limiter = Limiter}) -> +i(prefetch_count, #ch{consumer_prefetch = C}) -> C; +i(global_prefetch_count, #ch{limiter = Limiter}) -> rabbit_limiter:get_prefetch_limit(Limiter); i(Item, _) -> throw({bad_argument, Item}). |