diff options
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 8 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index 6e374dfb62..d4d7f70c25 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -858,14 +858,14 @@ <command>opening</command>, <command>running</command>, <command>closing</command>, <command>closed</command>]).</para></listitem> </varlistentry> <varlistentry> - <term>protocol</term> - <listitem><para>Version of the AMQP protocol in use (currently one of <command>amqp_0_9_1</command> or <command>amqp_0_8</command>). Note that if a client requests an AMQP 0-9 connection, we treat it as AMQP 0-9-1.</para></listitem> - </varlistentry> - <varlistentry> <term>channels</term> <listitem><para>Number of channels using the connection.</para></listitem> </varlistentry> <varlistentry> + <term>protocol</term> + <listitem><para>Version of the AMQP protocol in use (currently one of <command>amqp_0_9_1</command> or <command>amqp_0_8</command>). Note that if a client requests an AMQP 0-9 connection, we treat it as AMQP 0-9-1.</para></listitem> + </varlistentry> + <varlistentry> <term>user</term> <listitem><para>Username associated with the connection.</para></listitem> </varlistentry> 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}}) -> |