diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-10-22 11:08:29 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-10-22 11:08:29 +0100 |
| commit | 9f9648650eb86e17bda1ea91dbef072452aaca73 (patch) | |
| tree | ea529d2c02ab8a505808ba2a336e8144c875b2ae | |
| parent | 7e3a86f690c62e193569baa3a76d02503af87597 (diff) | |
| parent | f684c976a797d634481de17d52bddeee8aeb7c59 (diff) | |
| download | rabbitmq-server-9f9648650eb86e17bda1ea91dbef072452aaca73.tar.gz | |
merge heads
| -rw-r--r-- | ebin/rabbit_app.in | 2 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index 0431ee8a..16dfd196 100644 --- a/ebin/rabbit_app.in +++ b/ebin/rabbit_app.in @@ -43,7 +43,7 @@ {trace_vhosts, []}, {log_levels, [{connection, info}]}, {ssl_cert_login_from, distinguished_name}, - {reverse_dns_lookups, true}, + {reverse_dns_lookups, false}, {tcp_listen_options, [binary, {packet, raw}, {reuseaddr, true}, diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 9877eba3..fab5af61 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -43,15 +43,14 @@ -define(STATISTICS_KEYS, [pid, recv_oct, recv_cnt, send_oct, send_cnt, send_pend, state, last_blocked_by, last_blocked_age, - channels, host, peer_host]). - --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, - protocol, user, vhost, timeout, frame_max, - client_properties]). + channels]). + +-define(CREATION_EVENT_KEYS, + [pid, name, address, port, peer_address, peer_port, host, + peer_host, ssl, peer_cert_subject, peer_cert_issuer, + peer_cert_validity, auth_mechanism, ssl_protocol, + ssl_key_exchange, ssl_cipher, ssl_hash, protocol, user, vhost, + timeout, frame_max, client_properties]). -define(INFO_KEYS, ?CREATION_EVENT_KEYS ++ ?STATISTICS_KEYS -- [pid]). |