diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-01-05 11:25:31 -0800 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-01-05 11:25:31 -0800 |
| commit | c6c40352d46aa7f9de8aa412825122871e9aa3a6 (patch) | |
| tree | dc63e0028abca067399812a7912d533f99647b0f | |
| parent | 06d41a43c553596a7c602a072c533a10f387d23c (diff) | |
| download | rabbitmq-server-git-c6c40352d46aa7f9de8aa412825122871e9aa3a6.tar.gz | |
Rename a function
If it returned a map of users to connections
then "per_user" would be the perfect name.
However, it only returns connections of a single
user.
| -rw-r--r-- | src/rabbit_connection_tracking.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_connection_tracking_handler.erl | 2 | ||||
| -rw-r--r-- | test/per_user_connection_tracking_SUITE.erl | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit_connection_tracking.erl b/src/rabbit_connection_tracking.erl index fb887350b4..38684482ef 100644 --- a/src/rabbit_connection_tracking.erl +++ b/src/rabbit_connection_tracking.erl @@ -34,7 +34,7 @@ delete_tracked_connections_table_for_node/1, delete_per_vhost_tracked_connections_table_for_node/1, clear_tracked_connection_tables_for_this_node/0, register_connection/1, unregister_connection/1, - list/0, list/1, list_on_node/1, list_per_user/1, + list/0, list/1, list_on_node/1, list_of_user/1, tracked_connection_from_connection_created/1, tracked_connection_from_connection_state/1, count_connections_in/1]). @@ -217,9 +217,9 @@ list_on_node(Node) -> catch exit:{aborted, {no_exists, _}} -> [] end. --spec list_per_user(rabbit_types:username()) -> [rabbit_types:tracked_connection()]. +-spec list_of_user(rabbit_types:username()) -> [rabbit_types:tracked_connection()]. -list_per_user(Username) -> +list_of_user(Username) -> lists:foldl( fun (Node, Acc) -> Tab = tracked_connection_table_name_for(Node), diff --git a/src/rabbit_connection_tracking_handler.erl b/src/rabbit_connection_tracking_handler.erl index 68614bcfdc..cd60b82dbb 100644 --- a/src/rabbit_connection_tracking_handler.erl +++ b/src/rabbit_connection_tracking_handler.erl @@ -84,7 +84,7 @@ handle_event(#event{type = user_deleted, props = Details}, State) -> Username = pget(name, Details), rabbit_log_connection:info("Closing all connections from user '~s' because it's being deleted", [Username]), [close_connection(Conn, rabbit_misc:format("user '~s' is deleted", [Username])) - || Conn <- rabbit_connection_tracking:list_per_user(Username)], + || Conn <- rabbit_connection_tracking:list_of_user(Username)], {ok, State}; %% A node had been deleted from the cluster. handle_event(#event{type = node_deleted, props = Details}, State) -> diff --git a/test/per_user_connection_tracking_SUITE.erl b/test/per_user_connection_tracking_SUITE.erl index d602e31d5d..7f93aef1ac 100644 --- a/test/per_user_connection_tracking_SUITE.erl +++ b/test/per_user_connection_tracking_SUITE.erl @@ -32,7 +32,7 @@ all() -> groups() -> ClusterSize1Tests = [ - single_node_list_per_user, + single_node_list_of_user, single_node_user_deletion_forces_connection_closure ], ClusterSize2Tests = [ @@ -111,7 +111,7 @@ clear_all_connection_tracking_tables(Config) -> %% ------------------------------------------------------------------- %% Test cases. %% ------------------------------------------------------------------- -single_node_list_per_user(Config) -> +single_node_list_of_user(Config) -> Username = proplists:get_value(rmq_username, Config), Username2 = <<"guest2">>, @@ -240,7 +240,7 @@ connections_in(Config, Username) -> connections_in(Config, NodeIndex, Username) -> rabbit_ct_broker_helpers:rpc(Config, NodeIndex, rabbit_connection_tracking, - list_per_user, [Username]). + list_of_user, [Username]). all_connections(Config) -> all_connections(Config, 0). |
