diff options
author | Jean-Sebastien Pedron <jean-sebastien@rabbitmq.com> | 2014-12-03 14:10:35 +0100 |
---|---|---|
committer | Jean-Sebastien Pedron <jean-sebastien@rabbitmq.com> | 2014-12-03 14:10:35 +0100 |
commit | f59084f398c8d7f73209c5ea60dac28352c027b6 (patch) | |
tree | e7ef4da576af413b750f77cbe2d8cce22a3a2a6a | |
parent | 7378afd5fed81839813307fc9080a60af61aa91d (diff) | |
download | rabbitmq-server-f59084f398c8d7f73209c5ea60dac28352c027b6.tar.gz |
Filter out auth notification properties with no value
-rw-r--r-- | src/rabbit_direct.erl | 2 | ||||
-rw-r--r-- | src/rabbit_reader.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl index 931e1e4d..79c7a195 100644 --- a/src/rabbit_direct.erl +++ b/src/rabbit_direct.erl @@ -100,7 +100,7 @@ notify_auth_result(Username, AuthResult, ExtraProps) -> EventProps = [{connection_type, direct}] ++ [{name, case Username of none -> ''; _ -> Username end}] ++ ExtraProps, - rabbit_event:notify(AuthResult, EventProps). + rabbit_event:notify(AuthResult, [P || {_, V} = P <- EventProps, V =/= '']). connect1(User, VHost, Protocol, Pid, Infos) -> try rabbit_access_control:check_vhost_access(User, VHost, undefined) of diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 31e60e9a..0c5f0232 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -1127,7 +1127,7 @@ notify_auth_result(Username, AuthResult, ExtraProps, State) -> end ++ [{name, case Username of none -> ''; _ -> Username end}] ++ ExtraProps, - rabbit_event:notify(AuthResult, EventProps). + rabbit_event:notify(AuthResult, [P || {_, V} = P <- EventProps, V =/= '']). %%-------------------------------------------------------------------------- |