From 2c4bdf1d191d97d55461209f9f185a044ab84433 Mon Sep 17 00:00:00 2001 From: Jean-Sebastien Pedron Date: Tue, 2 Dec 2014 17:38:12 +0100 Subject: Use list comprehension instead of lists:foldl/3 To keep a somewhat logical order in the list of user_authentication_* properties, reverse the order of the AUTH_NOTIFICATION_INFO_KEYS list. This list was previously reversed by lists:foldl/3. --- src/rabbit_reader.erl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 88bbc367..60246fbe 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -59,9 +59,9 @@ -define(INFO_KEYS, ?CREATION_EVENT_KEYS ++ ?STATISTICS_KEYS -- [pid]). -define(AUTH_NOTIFICATION_INFO_KEYS, - [peer_cert_validity, peer_cert_subject, peer_cert_issuer, - ssl_cipher, ssl_protocol, ssl, auth_mechanism, protocol, - peer_port, peer_host, name, vhost, host]). + [host, vhost, name, peer_host, peer_port, protocol, auth_mechanism, + ssl, ssl_protocol, ssl_cipher, peer_cert_issuer, peer_cert_subject, + peer_cert_validity]). -define(IS_RUNNING(State), (State#v1.connection_state =:= running orelse @@ -1109,11 +1109,11 @@ auth_fail(Username, Msg, Args, AuthName, notify_auth_result(Username, AuthResult, Msg, Args, State) -> EventProps0 = [{connection_type, network}], - EventProps1 = lists:foldl( - fun - (name, Acc) -> [{connection_name, i(name, State)} | Acc]; - (Item, Acc) -> [{Item, i(Item, State)} | Acc] - end, EventProps0, ?AUTH_NOTIFICATION_INFO_KEYS), + EventProps1 = EventProps0 ++ [ + case Item of + name -> {connection_name, i(name, State)}; + _ -> {Item, i(Item, State)} + end || Item <- ?AUTH_NOTIFICATION_INFO_KEYS], EventProps2 = case Username of none -> [{name, ''} | EventProps1]; _ -> [{name, Username} | EventProps1] -- cgit v1.2.1