summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlvaro Videla <videlalvaro@gmail.com>2015-10-31 12:39:15 +0100
committerAlvaro Videla <videlalvaro@gmail.com>2015-10-31 12:39:15 +0100
commit7112c6896d8dded26bade8d51a27a850b299bfc7 (patch)
tree6a6e7f3143f50444b2391dcb07af9e33f65756ff /src
parentad8fea9914cd739765af6a88367388c74861c966 (diff)
downloadrabbitmq-server-git-7112c6896d8dded26bade8d51a27a850b299bfc7.tar.gz
moves emitting_map to rabbit_control_misc
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_auth_backend_internal.erl4
-rw-r--r--src/rabbit_binding.erl2
-rw-r--r--src/rabbit_exchange.erl2
-rw-r--r--src/rabbit_policy.erl2
-rw-r--r--src/rabbit_runtime_parameters.erl2
-rw-r--r--src/rabbit_vhost.erl2
6 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit_auth_backend_internal.erl b/src/rabbit_auth_backend_internal.erl
index 5eb4ab202d..ce5474dc9e 100644
--- a/src/rabbit_auth_backend_internal.erl
+++ b/src/rabbit_auth_backend_internal.erl
@@ -315,7 +315,7 @@ list_users() ->
U <- mnesia:dirty_match_object(rabbit_user, #internal_user{_ = '_'})].
list_users(Ref, AggregatorPid) ->
- rabbit_control_main:emitting_map(
+ rabbit_control_misc:emitting_map(
AggregatorPid, Ref,
fun(U) -> extract_internal_user_params(U) end,
mnesia:dirty_match_object(rabbit_user, #internal_user{_ = '_'})).
@@ -329,7 +329,7 @@ list_permissions(Keys, QueryThunk) ->
U <- rabbit_misc:execute_mnesia_transaction(QueryThunk)].
list_permissions(Keys, QueryThunk, Ref, AggregatorPid) ->
- rabbit_control_main:emitting_map(
+ rabbit_control_misc:emitting_map(
AggregatorPid, Ref, fun(U) -> extract_user_permission_params(Keys, U) end,
%% TODO: use dirty ops instead
rabbit_misc:execute_mnesia_transaction(QueryThunk)).
diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl
index 9a62fde757..609daf612e 100644
--- a/src/rabbit_binding.erl
+++ b/src/rabbit_binding.erl
@@ -287,7 +287,7 @@ info_all(VHostPath) -> map(VHostPath, fun (B) -> info(B) end).
info_all(VHostPath, Items) -> map(VHostPath, fun (B) -> info(B, Items) end).
info_all(VHostPath, Items, Ref, AggregatorPid) ->
- rabbit_control_main:emitting_map(
+ rabbit_control_misc:emitting_map(
AggregatorPid, Ref, fun(B) -> info(B, Items) end, list(VHostPath)).
has_for_source(SrcName) ->
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl
index e387c30239..ec5065a1d6 100644
--- a/src/rabbit_exchange.erl
+++ b/src/rabbit_exchange.erl
@@ -344,7 +344,7 @@ info_all(VHostPath) -> map(VHostPath, fun (X) -> info(X) end).
info_all(VHostPath, Items) -> map(VHostPath, fun (X) -> info(X, Items) end).
info_all(VHostPath, Items, Ref, AggregatorPid) ->
- rabbit_control_main:emitting_map(
+ rabbit_control_misc:emitting_map(
AggregatorPid, Ref, fun(X) -> info(X, Items) end, list(VHostPath)).
route(#exchange{name = #resource{virtual_host = VHost, name = RName} = XName,
diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl
index 5c2fd7907f..dd50095517 100644
--- a/src/rabbit_policy.erl
+++ b/src/rabbit_policy.erl
@@ -171,7 +171,7 @@ list_formatted(VHost) ->
order_policies(list0(VHost, fun format/1)).
list_formatted(VHost, Ref, AggregatorPid) ->
- rabbit_control_main:emitting_map(AggregatorPid, Ref,
+ rabbit_control_misc:emitting_map(AggregatorPid, Ref,
fun(P) -> P end, list_formatted(VHost)).
list0(VHost, DefnFun) ->
diff --git a/src/rabbit_runtime_parameters.erl b/src/rabbit_runtime_parameters.erl
index 2a2bc1e5f3..5e6f12904d 100644
--- a/src/rabbit_runtime_parameters.erl
+++ b/src/rabbit_runtime_parameters.erl
@@ -200,7 +200,7 @@ list_formatted(VHost) ->
[pset(value, format(pget(value, P)), P) || P <- list(VHost)].
list_formatted(VHost, Ref, AggregatorPid) ->
- rabbit_control_main:emitting_map(
+ rabbit_control_misc:emitting_map(
AggregatorPid, Ref,
fun(P) -> pset(value, format(pget(value, P)), P) end, list(VHost)).
diff --git a/src/rabbit_vhost.erl b/src/rabbit_vhost.erl
index ab0e8c8764..c1394c321c 100644
--- a/src/rabbit_vhost.erl
+++ b/src/rabbit_vhost.erl
@@ -158,5 +158,5 @@ info_all(Items) -> [info(VHost, Items) || VHost <- list()].
info_all(Ref, AggregatorPid) -> info_all(?INFO_KEYS, Ref, AggregatorPid).
info_all(Items, Ref, AggregatorPid) ->
- rabbit_control_main:emitting_map(
+ rabbit_control_misc:emitting_map(
AggregatorPid, Ref, fun(VHost) -> info(VHost, Items) end, list()).