better fun names

3 files changed, 22 insertions, 22 deletions

diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 26c0edbe..0cc686f4 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -1163,22 +1163,22 @@ handle_call(sync_mirrors, _From,
             State = #q{backing_queue       = rabbit_mirror_queue_master = BQ,
                        backing_queue_state = BQS}) ->
     S = fun(BQSN) -> State#q{backing_queue_state = BQSN} end,
-    InfoPull = fun (Status) ->
-                       receive {'$gen_call', From, {info, Items}} ->
-                               Infos = infos(Items, State#q{status = Status}),
-                               gen_server2:reply(From, {ok, Infos})
-                       after 0 ->
-                               ok
-                       end
-               end,
-    InfoPush = fun (Status) ->
-                       rabbit_event:if_enabled(
-                         State, #q.stats_timer,
-                         fun() -> emit_stats(State#q{status = Status}) end)
-               end,
+    HandleInfo = fun (Status) ->
+                         receive {'$gen_call', From, {info, Items}} ->
+                                 Infos = infos(Items, State#q{status = Status}),
+                                 gen_server2:reply(From, {ok, Infos})
+                         after 0 ->
+                                 ok
+                         end
+                 end,
+    EmitStats = fun (Status) ->
+                        rabbit_event:if_enabled(
+                          State, #q.stats_timer,
+                          fun() -> emit_stats(State#q{status = Status}) end)
+                end,
     case BQ:depth(BQS) - BQ:len(BQS) of
         0 -> case rabbit_mirror_queue_master:sync_mirrors(
-                    InfoPull, InfoPush, BQS) of
+                    HandleInfo, EmitStats, BQS) of
                  {shutdown, Reason, BQS1} -> {stop, Reason, S(BQS1)};
                  {Result, BQS1}           -> reply(Result, S(BQS1))
              end;
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl
index 601649ef..db0308b7 100644
--- a/src/rabbit_mirror_queue_master.erl
+++ b/src/rabbit_mirror_queue_master.erl
@@ -127,7 +127,7 @@ stop_mirroring(State = #state { coordinator         = CPid,
     stop_all_slaves(shutdown, State),
     {BQ, BQS}.
 
-sync_mirrors(InfoPull, InfoPush,
+sync_mirrors(HandleInfo, EmitStats,
              State = #state { name                = QName,
                               gm                  = GM,
                               backing_queue       = BQ,
@@ -143,7 +143,7 @@ sync_mirrors(InfoPull, InfoPush,
     gm:broadcast(GM, {sync_start, Ref, Syncer, SPids}),
     S = fun(BQSN) -> State#state{backing_queue_state = BQSN} end,
     case rabbit_mirror_queue_sync:master_go(
-           Syncer, Ref, Log, InfoPull, InfoPush, BQ, BQS) of
+           Syncer, Ref, Log, HandleInfo, EmitStats, BQ, BQS) of
         {shutdown,  R, BQS1}   -> {stop, R, S(BQS1)};
         {sync_died, R, BQS1}   -> Log("~p", [R]),
                                   {ok, S(BQS1)};
diff --git a/src/rabbit_mirror_queue_sync.erl b/src/rabbit_mirror_queue_sync.erl
index 5f0307fc..a1c54517 100644
--- a/src/rabbit_mirror_queue_sync.erl
+++ b/src/rabbit_mirror_queue_sync.erl
@@ -59,12 +59,12 @@ master_prepare(Ref, Log, SPids) ->
     MPid = self(),
     spawn_link(fun () -> syncer(Ref, Log, MPid, SPids) end).
 
-master_go(Syncer, Ref, Log, InfoPull, InfoPush, BQ, BQS) ->
-    Args = {Syncer, Ref, Log, InfoPull, InfoPush, rabbit_misc:get_parent()},
+master_go(Syncer, Ref, Log, HandleInfo, EmitStats, BQ, BQS) ->
+    Args = {Syncer, Ref, Log, HandleInfo, EmitStats, rabbit_misc:get_parent()},
     receive
         {'EXIT', Syncer, normal} -> {already_synced, BQS};
         {'EXIT', Syncer, Reason} -> {sync_died, Reason, BQS};
-        {ready, Syncer}          -> InfoPush({syncing, 0}),
+        {ready, Syncer}          -> EmitStats({syncing, 0}),
                                     master_go0(Args, BQ, BQS)
     end.
 
@@ -77,15 +77,15 @@ master_go0(Args, BQ, BQS) ->
         {_,                   BQS1} -> master_done(Args, BQS1)
     end.
 
-master_send(Msg, MsgProps, {Syncer, Ref, Log, InfoPull, InfoPush, Parent},
+master_send(Msg, MsgProps, {Syncer, Ref, Log, HandleInfo, EmitStats, Parent},
             {I, Last}) ->
     T = case timer:now_diff(erlang:now(), Last) > ?SYNC_PROGRESS_INTERVAL of
-            true  -> InfoPush({syncing, I}),
+            true  -> EmitStats({syncing, I}),
                      Log("~p messages", [I]),
                      erlang:now();
             false -> Last
         end,
-    InfoPull({syncing, I}),
+    HandleInfo({syncing, I}),
     receive
         {'$gen_cast', {set_maximum_since_use, Age}} ->
             ok = file_handle_cache:set_maximum_since_use(Age)