From f59084f398c8d7f73209c5ea60dac28352c027b6 Mon Sep 17 00:00:00 2001 From: Jean-Sebastien Pedron Date: Wed, 3 Dec 2014 14:10:35 +0100 Subject: Filter out auth notification properties with no value --- src/rabbit_direct.erl | 2 +- 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 =/= '']). %%-------------------------------------------------------------------------- -- cgit v1.2.1