summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2010-02-03 22:07:46 +0000
committerMatthias Radestock <matthias@lshift.net>2010-02-03 22:07:46 +0000
commit2b94d25b8d0f99cbdad0a5ffae669d4439b3255a (patch)
tree13cdd7c588a7197fcfb270579fc7e1eec8db9e09
parent0f3e69630f48ae1b08713a4405f847b6c20c19f6 (diff)
downloadrabbitmq-server-2b94d25b8d0f99cbdad0a5ffae669d4439b3255a.tar.gz
add info item for channel number
-rw-r--r--docs/rabbitmqctl.1.pod5
-rw-r--r--src/rabbit_channel.erl2
-rw-r--r--src/rabbit_control.erl8
3 files changed, 11 insertions, 4 deletions
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod
index b82d5b87..8921f7d7 100644
--- a/docs/rabbitmqctl.1.pod
+++ b/docs/rabbitmqctl.1.pod
@@ -396,6 +396,11 @@ id of the Erlang process associated with the channel
id of the Erlang process associated with the connection to which the
channel belongs
+=item number
+
+the number of the channel, which uniquely identifies it within a
+connection
+
=item user
username associated with the channel
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 7db80425..3cee196d 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -56,6 +56,7 @@
-define(INFO_KEYS,
[pid,
connection,
+ number,
user,
vhost,
transactional,
@@ -1007,6 +1008,7 @@ infos(Items, State) -> [{Item, i(Item, State)} || Item <- Items].
i(pid, _) -> self();
i(connection, #ch{reader_pid = ReaderPid}) -> ReaderPid;
+i(number, #ch{channel = Channel}) -> Channel;
i(user, #ch{username = Username}) -> Username;
i(vhost, #ch{virtual_host = VHost}) -> VHost;
i(transactional, #ch{transaction_id = TxnKey}) -> TxnKey =/= none;
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 738ed444..03520002 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -192,10 +192,10 @@ frame_max, client_properties, recv_oct, recv_cnt, send_oct, send_cnt,
send_pend]. The default is to display user, peer_address, peer_port
and state.
-<ChannelInfoItem> must be a member of the list [pid, connection, user,
-vhost, transactional, consumer_count, messages_unacknowledged,
-prefetch_count]. The default is to display pid, user, transactional,
-consumer_count, messages_unacknowledged.
+<ChannelInfoItem> must be a member of the list [pid, connection,
+number, user, vhost, transactional, consumer_count,
+messages_unacknowledged, prefetch_count]. The default is to display
+pid, user, transactional, consumer_count, messages_unacknowledged.
"),
halt(1).