summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-07-02 15:34:46 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-07-02 15:34:46 +0100
commit5c121848c1198e270dc8153db57b47833a7d626c (patch)
tree4fa4e7009b2c3670fd2bb3c14c6d6e71fb46d1dd /src
parent3e02099c9a37eb1bcbe93a7d898261314e127518 (diff)
downloadrabbitmq-server-git-5c121848c1198e270dc8153db57b47833a7d626c.tar.gz
cosmetic: more sensible place for protocol in info items
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_reader.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 1eaabe34b2..e8e6bb19b8 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -61,9 +61,9 @@
queue_collector}).
-define(INFO_KEYS,
- [pid, address, port, peer_address, peer_port, protocol,
- recv_oct, recv_cnt, send_oct, send_cnt, send_pend,
- state, channels, user, vhost, timeout, frame_max, client_properties]).
+ [pid, address, port, peer_address, peer_port,
+ recv_oct, recv_cnt, send_oct, send_cnt, send_pend, state, channels,
+ protocol, user, vhost, timeout, frame_max, client_properties]).
%% connection lifecycle
%%
@@ -728,8 +728,6 @@ i(peer_address, #v1{sock = Sock}) ->
i(peer_port, #v1{sock = Sock}) ->
{ok, {_, P}} = rabbit_net:peername(Sock),
P;
-i(protocol, #v1{connection = #connection{protocol_name = ProtocolName}}) ->
- ProtocolName;
i(SockStat, #v1{sock = Sock}) when SockStat =:= recv_oct;
SockStat =:= recv_cnt;
SockStat =:= send_oct;
@@ -744,6 +742,8 @@ i(state, #v1{connection_state = S}) ->
S;
i(channels, #v1{}) ->
length(all_channels());
+i(protocol, #v1{connection = #connection{protocol_name = ProtocolName}}) ->
+ ProtocolName;
i(user, #v1{connection = #connection{user = #user{username = Username}}}) ->
Username;
i(user, #v1{connection = #connection{user = none}}) ->