summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-07-01 13:58:27 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-07-01 13:58:27 +0100
commit9da1f8a0965a560b3f1adabf1048ba2c2a4d4a7e (patch)
tree0c83b7d154f6c8e1a4eb98e48ce1ed67a2d3ab2b
parent9473ebe9d4e94c91ad61a35485aad6a6555be57c (diff)
downloadrabbitmq-server-9da1f8a0965a560b3f1adabf1048ba2c2a4d4a7e.tar.gz
More consistent and correct nomenclature.
-rw-r--r--src/rabbit_amqqueue_process.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index dc2a7a3f..a0c06598 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -276,7 +276,7 @@ terminate_shutdown(Fun, State = #q{q = Q}) ->
undefined -> State1;
_ -> ok = rabbit_memory_monitor:deregister(self()),
QName = qname(State),
- rabbit_federation_queue:terminate(Q),
+ rabbit_federation_queue:maybe_stop(Q),
[emit_consumer_deleted(Ch, CTag, QName)
|| {Ch, CTag, _} <- consumers(State1)],
State1#q{backing_queue_state = Fun(BQS)}
@@ -547,7 +547,7 @@ notify_federation(#q{q = Q,
IsEmpty = BQ:is_empty(BQS),
case IsEmpty andalso active_unfederated(ActiveConsumers) of
true -> rabbit_federation_queue:run(Q);
- false -> rabbit_federation_queue:stop(Q)
+ false -> rabbit_federation_queue:pause(Q)
end.
active_unfederated(Cs) ->