diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-11-10 17:59:45 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-11-10 17:59:45 +0000 |
| commit | 10e2f11669159fd152c29c5bef39c20c18780b24 (patch) | |
| tree | c1a3ae5cc57496c7f3e9c6888ebe3a7091cadb17 | |
| parent | df0b88c11ab4e06d35b93b5cce479ef2a08b51d2 (diff) | |
| download | rabbitmq-server-10e2f11669159fd152c29c5bef39c20c18780b24.tar.gz | |
Add an "ssl" info item.
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 5 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index acb99bc8..6b02abe4 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -972,6 +972,11 @@ <listitem><para>Peer port.</para></listitem> </varlistentry> <varlistentry> + <term>ssl</term> + <listitem><para>Boolean indicating whether the + connection is secured with SSL.</para></listitem> + </varlistentry> + <varlistentry> <term>peer_cert_subject</term> <listitem><para>The subject of the peer's SSL certificate, in RFC4514 form.</para></listitem> diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index afc383d6..c7261c28 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -65,7 +65,7 @@ -define(STATISTICS_KEYS, [pid, recv_oct, recv_cnt, send_oct, send_cnt, send_pend, state, channels]). --define(CREATION_EVENT_KEYS, [pid, address, port, peer_address, peer_port, +-define(CREATION_EVENT_KEYS, [pid, address, port, peer_address, peer_port, ssl, peer_cert_subject, peer_cert_issuer, peer_cert_validity, protocol, user, vhost, timeout, frame_max, @@ -839,6 +839,8 @@ i(peer_address, #v1{sock = Sock}) -> socket_info(fun rabbit_net:peername/1, fun ({A, _}) -> A end, Sock); i(peer_port, #v1{sock = Sock}) -> socket_info(fun rabbit_net:peername/1, fun ({_, P}) -> P end, Sock); +i(ssl, #v1{sock = Sock}) -> + is_record(Sock, ssl_socket); i(peer_cert_issuer, #v1{sock = Sock}) -> cert_info(fun rabbit_ssl:peer_cert_issuer/1, Sock); i(peer_cert_subject, #v1{sock = Sock}) -> |