diff options
| author | Jean-Sebastien Pedron <jean-sebastien@rabbitmq.com> | 2014-12-10 11:42:13 +0100 |
|---|---|---|
| committer | Jean-Sebastien Pedron <jean-sebastien@rabbitmq.com> | 2014-12-10 11:42:13 +0100 |
| commit | 643d598dfc6452b301a9ceeceb20f68d6a820336 (patch) | |
| tree | b08d8c0e2a6ebde444e4ff67dab1fd0744321eb6 | |
| parent | 3e4d1f7b0d46ca99f7ecc05e6ec29c1d17ff8d2c (diff) | |
| download | rabbitmq-server-643d598dfc6452b301a9ceeceb20f68d6a820336.tar.gz | |
No need to concatenate hard-coded lists...bug26393
| -rw-r--r-- | src/rabbit_direct.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl index 79c7a195..11233e7e 100644 --- a/src/rabbit_direct.erl +++ b/src/rabbit_direct.erl @@ -97,8 +97,8 @@ connect0(AuthFun, VHost, Protocol, Pid, Infos) -> end. notify_auth_result(Username, AuthResult, ExtraProps) -> - EventProps = [{connection_type, direct}] ++ - [{name, case Username of none -> ''; _ -> Username end}] ++ + EventProps = [{connection_type, direct}, + {name, case Username of none -> ''; _ -> Username end}] ++ ExtraProps, rabbit_event:notify(AuthResult, [P || {_, V} = P <- EventProps, V =/= '']). diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index e1ffb704..c92eaf7f 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -1110,12 +1110,12 @@ auth_fail(Username, Msg, Args, AuthName, rabbit_misc:protocol_error(AmqpError). notify_auth_result(Username, AuthResult, ExtraProps, State) -> - EventProps = [{connection_type, network}] ++ + EventProps = [{connection_type, network}, + {name, case Username of none -> ''; _ -> Username end}] ++ [case Item of name -> {connection_name, i(name, State)}; _ -> {Item, i(Item, State)} end || Item <- ?AUTH_NOTIFICATION_INFO_KEYS] ++ - [{name, case Username of none -> ''; _ -> Username end}] ++ ExtraProps, rabbit_event:notify(AuthResult, [P || {_, V} = P <- EventProps, V =/= '']). |