diff options
author | Jean-Sebastien Pedron <jean-sebastien@rabbitmq.com> | 2014-12-03 14:05:03 +0100 |
---|---|---|
committer | Jean-Sebastien Pedron <jean-sebastien@rabbitmq.com> | 2014-12-03 14:05:03 +0100 |
commit | 7378afd5fed81839813307fc9080a60af61aa91d (patch) | |
tree | af8f51b8a15aa1ced6715b73e96e835016f31c8b | |
parent | e74bd8fe71260fe669793bcdad245591a61c56ab (diff) | |
download | rabbitmq-server-7378afd5fed81839813307fc9080a60af61aa91d.tar.gz |
Style fix: Use ++ to construct EventProps, not multiple temporary variables
-rw-r--r-- | src/rabbit_direct.erl | 9 | ||||
-rw-r--r-- | src/rabbit_reader.erl | 33 |
2 files changed, 17 insertions, 25 deletions
diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl index 34eff61f..931e1e4d 100644 --- a/src/rabbit_direct.erl +++ b/src/rabbit_direct.erl @@ -97,12 +97,9 @@ connect0(AuthFun, VHost, Protocol, Pid, Infos) -> end. notify_auth_result(Username, AuthResult, ExtraProps) -> - EventProps0 = [{connection_type, direct}], - EventProps1 = case Username of - none -> [{name, ''} | EventProps0]; - _ -> [{name, Username} | EventProps0] - end, - EventProps = EventProps1 ++ ExtraProps, + EventProps = [{connection_type, direct}] ++ + [{name, case Username of none -> ''; _ -> Username end}] ++ + ExtraProps, rabbit_event:notify(AuthResult, EventProps). connect1(User, VHost, Protocol, Pid, Infos) -> diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 968e6a4d..31e60e9a 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -1113,25 +1113,20 @@ auth_fail(Username, Msg, Args, AuthName, rabbit_misc:protocol_error(AmqpError). notify_auth_result(Username, AuthResult, ExtraProps, State) -> - EventProps0 = [{connection_type, network}], - EventProps1 = EventProps0 ++ [ - case Item of - name -> {connection_name, i(name, State)}; - _ -> {Item, i(Item, State)} - end || Item <- ?AUTH_NOTIFICATION_INFO_KEYS], - EventProps2 = case i(ssl, State) of - false -> EventProps1; - true -> EventProps1 ++ [ - case Item of - name -> {connection_name, i(name, State)}; - _ -> {Item, i(Item, State)} - end || Item <- ?AUTH_NOTIFICATION_SSL_INFO_KEYS] - end, - EventProps3 = case Username of - none -> [{name, ''} | EventProps2]; - _ -> [{name, Username} | EventProps2] - end, - EventProps = EventProps3 ++ ExtraProps, + EventProps = [{connection_type, network}] ++ + [case Item of + name -> {connection_name, i(name, State)}; + _ -> {Item, i(Item, State)} + end || Item <- ?AUTH_NOTIFICATION_INFO_KEYS] ++ + case i(ssl, State) of + false -> []; + true -> [case Item of + name -> {connection_name, i(name, State)}; + _ -> {Item, i(Item, State)} + end || Item <- ?AUTH_NOTIFICATION_SSL_INFO_KEYS] + end ++ + [{name, case Username of none -> ''; _ -> Username end}] ++ + ExtraProps, rabbit_event:notify(AuthResult, EventProps). %%-------------------------------------------------------------------------- |