diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-02-03 22:07:46 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-02-03 22:07:46 +0000 |
| commit | f3282d3aa4f777a2402adb4c6741ba43f902aa45 (patch) | |
| tree | 13cdd7c588a7197fcfb270579fc7e1eec8db9e09 | |
| parent | 1ee896c9f0735434a75a646570a48cec613c8994 (diff) | |
| download | rabbitmq-server-git-f3282d3aa4f777a2402adb4c6741ba43f902aa45.tar.gz | |
add info item for channel number
| -rw-r--r-- | docs/rabbitmqctl.1.pod | 5 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_control.erl | 8 |
3 files changed, 11 insertions, 4 deletions
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod index b82d5b87f4..8921f7d78c 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 7db80425fe..3cee196d7b 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 738ed444f4..0352000292 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). |