Rename function, remove utter rubbish.

3 files changed, 15 insertions, 15 deletions

diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 0565b1a5..b32aefdb 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -207,18 +207,18 @@ recover_durable_queues(DurableQueues) ->
 
 declare(QueueName, Durable, AutoDelete, Args, Owner) ->
     ok = check_declare_arguments(QueueName, Args),
-    Node = node(), %% TODO utter rubbish
-    Q = start_queue_process(
-          Node, rabbit_policy:set(#amqqueue{name            = QueueName,
-                                            durable         = Durable,
-                                            auto_delete     = AutoDelete,
-                                            arguments       = Args,
-                                            exclusive_owner = Owner,
-                                            pid             = none,
-                                            slave_pids      = []})),
-    case gen_server2:call(Q#amqqueue.pid, {init, false}, infinity) of
+    Q0 = rabbit_policy:set(#amqqueue{name            = QueueName,
+                                     durable         = Durable,
+                                     auto_delete     = AutoDelete,
+                                     arguments       = Args,
+                                     exclusive_owner = Owner,
+                                     pid             = none,
+                                     slave_pids      = []}),
+    {Node, _MNodes} = rabbit_mirror_queue_misc:queue_nodes(Q0),
+    Q1 = start_queue_process(Node, Q0),
+    case gen_server2:call(Q1#amqqueue.pid, {init, false}, infinity) of
         not_found -> rabbit_misc:not_found(QueueName);
-        Q1        -> Q1
+        Q2        -> Q2
     end.
 
 internal_declare(Q, true) ->
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl
index 899c31b7..50349204 100644
--- a/src/rabbit_mirror_queue_master.erl
+++ b/src/rabbit_mirror_queue_master.erl
@@ -87,7 +87,7 @@ init(#amqqueue { name = QName } = Q, Recover,
     {ok, CPid} = rabbit_mirror_queue_coordinator:start_link(
                    Q, undefined, sender_death_fun(), length_fun()),
     GM = rabbit_mirror_queue_coordinator:get_gm(CPid),
-    {_MNode, MNodes} = rabbit_mirror_queue_misc:determine_queue_nodes(Q),
+    {_MNode, MNodes} = rabbit_mirror_queue_misc:queue_nodes(Q),
     MNodes1 = MNodes -- [node()],
     [rabbit_mirror_queue_misc:add_mirror(QName, Node) || Node <- MNodes1],
     {ok, BQ} = application:get_env(backing_queue_module),
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl
index 876257b8..a84623f6 100644
--- a/src/rabbit_mirror_queue_misc.erl
+++ b/src/rabbit_mirror_queue_misc.erl
@@ -21,7 +21,7 @@
          report_deaths/4]).
 
 %% temp
--export([determine_queue_nodes/1, is_mirrored/1, slave_pids/1]).
+-export([queue_nodes/1, is_mirrored/1, slave_pids/1]).
 
 
 -include("rabbit.hrl").
@@ -94,7 +94,7 @@ on_node_up() ->
           fun () ->
                   mnesia:foldl(
                     fun (Q = #amqqueue{name = QName}, QNames0) ->
-                            {_MNode, MNodes} = determine_queue_nodes(Q),
+                            {_MNode, MNodes} = queue_nodes(Q),
                             case lists:member(node(), MNodes) of
                                 true  -> [QName | QNames0];
                                 false -> QNames0
@@ -173,7 +173,7 @@ report_deaths(MirrorPid, IsMaster, QueueName, DeadPids) ->
 
 %%----------------------------------------------------------------------------
 
-determine_queue_nodes(Q) ->
+queue_nodes(Q) ->
     case [rabbit_policy:get(P, Q) || P <- [<<"ha-mode">>, <<"ha-params">>]] of
         [{ok, <<"all">>}, _] ->
             {node(), rabbit_mnesia:all_clustered_nodes()};