diff options
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 6 | ||||
| -rw-r--r-- | src/rabbit_control.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index a2038cf0e9..8223a6905a 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -858,6 +858,10 @@ <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> @@ -905,7 +909,7 @@ </variablelist> <para> If no <command>connectioninfoitem</command>s are specified then user, peer - address, peer port and connection state are displayed. + address, peer port, connection state and protocol are displayed. </para> <para role="example-prefix"> diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 323d4d2fd1..042f82844f 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -240,7 +240,8 @@ action(list_bindings, Node, Args, Inform) -> action(list_connections, Node, Args, Inform) -> Inform("Listing connections", []), - ArgAtoms = default_if_empty(Args, [user, peer_address, peer_port, state]), + ArgAtoms = default_if_empty(Args, [user, peer_address, peer_port, state, + protocol]), display_info_list(rpc_call(Node, rabbit_networking, connection_info_all, [ArgAtoms]), ArgAtoms); diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 1dab344ee9..eba738f3f7 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -61,7 +61,7 @@ queue_collector}). -define(INFO_KEYS, - [pid, address, port, peer_address, peer_port, + [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]). @@ -727,6 +727,8 @@ 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 = Protocol}}) -> + Protocol; i(SockStat, #v1{sock = Sock}) when SockStat =:= recv_oct; SockStat =:= recv_cnt; SockStat =:= send_oct; |