summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2016-08-04 12:12:36 -0700
committerMichael Klishin <mklishin@pivotal.io>2016-08-04 12:12:36 -0700
commit0457b588f33751b23fad2a0e618c45174de1701e (patch)
tree48d3170ae38fa1311828e22feffa3eeae65669b6 /src
parentda08e953d1de90d0e06481a267585f0316861ea7 (diff)
downloadrabbitmq-server-git-0457b588f33751b23fad2a0e618c45174de1701e.tar.gz
Simplify
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_connection_tracking_handler.erl9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/rabbit_connection_tracking_handler.erl b/src/rabbit_connection_tracking_handler.erl
index 66ef1f2524..3fda7e9797 100644
--- a/src/rabbit_connection_tracking_handler.erl
+++ b/src/rabbit_connection_tracking_handler.erl
@@ -76,12 +76,9 @@ handle_event(#event{type = connection_closed, props = Details}, State) ->
handle_event(#event{type = vhost_deleted, props = Details}, State) ->
VHost = proplists:get_value(name, Details),
rabbit_log_connection:info("Closing all connections in vhost '~s' because it's being deleted", [VHost]),
- case rabbit_connection_tracking:list(VHost) of
- [] -> {ok, State};
- Cs ->
- [rabbit_networking:close_connection(Pid, rabbit_misc:format("vhost '~s' is deleted", [VHost])) || #tracked_connection{pid = Pid} <- Cs],
- {ok, State}
- end;
+ [rabbit_networking:close_connection(Pid, rabbit_misc:format("vhost '~s' is deleted", [VHost])) ||
+ #tracked_connection{pid = Pid} <- rabbit_connection_tracking:list(VHost)],
+ {ok, State};
handle_event(#event{type = user_deleted, props = Details}, State) ->
_Username = proplists:get_value(name, Details),
%% TODO: force close and unregister connections from