Use list comprehensions to build the stats proplists.

3 files changed, 25 insertions, 43 deletions

diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index cec365539d..6222bd7a72 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -73,13 +73,8 @@
              txn,
              unsent_message_count}).
 
--define(INFO_KEYS,
-        [name,
-         durable,
-         auto_delete,
-         arguments,
-         pid,
-         owner_pid,
+-define(STATISTICS_KEYS,
+        [pid,
          exclusive_consumer_pid,
          exclusive_consumer_tag,
          messages_ready,
@@ -90,6 +85,14 @@
          backing_queue_status
         ]).
 
+-define(INFO_KEYS,
+        [name,
+         durable,
+         auto_delete,
+         arguments,
+         owner_pid] ++
+            ?STATISTICS_KEYS).
+
 %%----------------------------------------------------------------------------
 
 start_link(Q) -> gen_server2:start_link(?MODULE, Q, []).
@@ -539,14 +542,7 @@ maybe_emit_stats(State = #q{last_statistics_update = LastUpdate}) ->
         true ->
             rabbit_event:notify(
               queue_stats,
-              [{qpid,                    self()},
-               {messages_ready,          i(messages_ready, State)},
-               {messages_unacknowledged, i(messages_unacknowledged, State)},
-               {consumers,               i(consumers, State)},
-               {memory,                  i(memory, State)},
-               {exclusive_consumer_tag,  i(exclusive_consumer_tag, State)},
-               {exclusive_consumer_pid,  i(exclusive_consumer_pid, State)},
-               {backing_queue_status,    i(backing_queue_status, State)}]),
+              [{Item, i(Item, State)} || Item <- ?STATISTICS_KEYS]),
             State#q{last_statistics_update = Now};
         _ ->
             State
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 2a6e51e1e4..b0ccf9fb41 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -158,7 +158,7 @@ init([Channel, ReaderPid, WriterPid, Username, VHost, CollectorPid]) ->
     process_flag(trap_exit, true),
     link(WriterPid),
     ok = pg_local:join(rabbit_channels, self()),
-    rabbit_event:notify(channel_created, [{channel_pid,     self()},
+    rabbit_event:notify(channel_created, [{pid,             self()},
                                           {connection_pid,  ReaderPid},
                                           {channel,         Channel},
                                           {user,            Username},
@@ -1134,7 +1134,7 @@ internal_deliver(WriterPid, Notify, ConsumerTag, DeliveryTag,
 
 terminate(#ch{writer_pid = WriterPid, limiter_pid = LimiterPid}) ->
     pg_local:leave(rabbit_channels, self()),
-    rabbit_event:notify(channel_closed, [{channel_pid, self()}]),
+    rabbit_event:notify(channel_closed, [{pid, self()}]),
     rabbit_writer:shutdown(WriterPid),
     rabbit_limiter:shutdown(LimiterPid).
 
@@ -1190,7 +1190,7 @@ maybe_emit_stats(State = #ch{exchange_statistics = ExchangeStatistics,
         true ->
             rabbit_event:notify(
               channel_stats,
-              [{channel_pid, self()},
+              [{pid, self()},
                {per_exchange_statistics, dict:to_list(ExchangeStatistics)},
                {per_queue_statistics, dict:to_list(QueueStatistics)}]),
             State#ch{last_statistics_update = Now};
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index fe7d17e82b..bb1005b0d5 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -60,10 +60,13 @@
 -record(v1, {sock, connection, callback, recv_ref, connection_state,
              queue_collector, last_statistics_update}).
 
--define(INFO_KEYS,
-        [pid, address, port, peer_address, peer_port,
-         recv_oct, recv_cnt, send_oct, send_cnt, send_pend,
-         state, channels, user, vhost, timeout, frame_max, client_properties]).
+-define(STATISTICS_KEYS, [pid, recv_oct, recv_cnt, send_oct, send_cnt,
+                          send_pend, state, channels]).
+
+-define(CREATION_EVENT_KEYS, [address, port, peer_address, peer_port,
+                    user, vhost, timeout, frame_max, client_properties]).
+
+-define(INFO_KEYS, ?CREATION_EVENT_KEYS ++ ?STATISTICS_KEYS).
 
 %% connection lifecycle
 %%
@@ -275,7 +278,7 @@ start_connection(Parent, Deb, Sock, SockTransform) ->
         teardown_profiling(ProfilingValue),
         rabbit_queue_collector:shutdown(Collector),
         rabbit_misc:unlink_and_capture_exit(Collector),
-        rabbit_event:notify(connection_closed, [{connection_pid, self()}])
+        rabbit_event:notify(connection_closed, [{pid, self()}])
     end,
     done.
 
@@ -652,8 +655,7 @@ handle_method0(#'connection.open'{virtual_host = VHostPath,
                                   insist = Insist},
                State = #v1{connection_state = opening,
                            connection = Connection = #connection{
-                                          user = User,
-                                          vhost = VHost},
+                                          user = User},
                            sock = Sock}) ->
     ok = rabbit_access_control:check_vhost_access(User, VHostPath),
     NewConnection = Connection#connection{vhost = VHostPath},
@@ -665,16 +667,7 @@ handle_method0(#'connection.open'{virtual_host = VHostPath,
                    #'connection.open_ok'{known_hosts = KnownHosts}),
             rabbit_event:notify(
               connection_created,
-              [{connection_pid,    self()},
-               {address,           i(address, State)},
-               {port,              i(port, State)},
-               {peer_address,      i(peer_address, State)},
-               {peer_port,         i(peer_port, State)},
-               {user,              User},
-               {vhost,             VHost},
-               {timeout,           i(timeout, State)},
-               {frame_max,         i(frame_max, State)},
-               {client_properties, i(client_properties, State)}]),
+              [{Item, i(Item, State)} || Item <- [pid|?CREATION_EVENT_KEYS]]),
             State#v1{connection_state = running,
                      connection = NewConnection};
        true ->
@@ -870,14 +863,7 @@ maybe_emit_stats(State = #v1{last_statistics_update = LastUpdate}) ->
         true ->
             rabbit_event:notify(
               connection_stats,
-              [{connection_pid,  self()},
-               {state,           i(state, State)},
-               {channels,        i(channels, State)},
-               {recv_oct,        i(recv_oct, State)},
-               {recv_cnt,        i(recv_cnt, State)},
-               {send_oct,        i(send_oct, State)},
-               {send_cnt,        i(send_cnt, State)},
-               {send_pend,       i(send_pend, State)}]),
+              [{Item, i(Item, State)} || Item <- ?STATISTICS_KEYS]),
             State#v1{last_statistics_update = Now};
         _ ->
             State