diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-02-22 10:52:04 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-02-22 10:52:04 +0000 |
| commit | 61b22fe80b9d9fa11ec52c441f7cc6c346021a63 (patch) | |
| tree | 1d037515e11b23d599b189ae9e64fd7cb600241e | |
| parent | 5f7d155907af53e7f4785dd5c2bb5113c4d184df (diff) | |
| download | rabbitmq-server-git-61b22fe80b9d9fa11ec52c441f7cc6c346021a63.tar.gz | |
name info item for connections.
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 4 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index c1c51f9f8b..3ca276ced1 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -1011,6 +1011,10 @@ <listitem><para>Id of the Erlang process associated with the connection.</para></listitem> </varlistentry> <varlistentry> + <term>name</term> + <listitem><para>Readable name for the connection.</para></listitem> + </varlistentry> + <varlistentry> <term>address</term> <listitem><para>Server IP address.</para></listitem> </varlistentry> diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 01242e81b8..aa962ae3c2 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -45,8 +45,8 @@ send_pend, state, last_blocked_by, last_blocked_age, channels]). --define(CREATION_EVENT_KEYS, [pid, address, port, peer_address, peer_port, ssl, - peer_cert_subject, peer_cert_issuer, +-define(CREATION_EVENT_KEYS, [pid, name, address, port, peer_address, peer_port, + ssl, peer_cert_subject, peer_cert_issuer, peer_cert_validity, auth_mechanism, ssl_protocol, ssl_key_exchange, ssl_cipher, ssl_hash, @@ -185,13 +185,13 @@ socket_op(Sock, Fun) -> exit(normal) end. +name(Sock) -> + socket_op(Sock, fun (S) -> rabbit_net:connection_string(S, inbound) end). + start_connection(Parent, ChannelSupSupPid, Collector, StartHeartbeatFun, Deb, Sock, SockTransform) -> process_flag(trap_exit, true), - ConnStr = socket_op(Sock, fun (Sock0) -> - rabbit_net:connection_string( - Sock0, inbound) - end), + ConnStr = name(Sock), log(info, "accepting AMQP connection ~p (~s)~n", [self(), ConnStr]), ClientSock = socket_op(Sock, SockTransform), erlang:send_after(?HANDSHAKE_TIMEOUT * 1000, self(), @@ -801,6 +801,8 @@ infos(Items, State) -> [{Item, i(Item, State)} || Item <- Items]. i(pid, #v1{}) -> self(); +i(name, #v1{sock = Sock}) -> + list_to_binary(name(Sock)); i(address, #v1{sock = Sock}) -> socket_info(fun rabbit_net:sockname/1, fun ({A, _}) -> A end, Sock); i(port, #v1{sock = Sock}) -> |