summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-10-22 11:08:29 +0100
committerSimon MacMullen <simon@rabbitmq.com>2012-10-22 11:08:29 +0100
commitf774e7ba2fd8e478ddacc11729175f64344a71cf (patch)
treeea529d2c02ab8a505808ba2a336e8144c875b2ae /src
parent825041338135d90671e0187252fc916c4de82d31 (diff)
parent2c591c35baaf693789fe4a4d2e14e978d9f9e482 (diff)
downloadrabbitmq-server-git-f774e7ba2fd8e478ddacc11729175f64344a71cf.tar.gz
merge heads
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_reader.erl17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 9877eba387..fab5af61e6 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]).