summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2012-02-06 15:54:25 +0000
committerAlexandru Scvortov <alexandru@rabbitmq.com>2012-02-06 15:54:25 +0000
commit6e728902a8c7223a23b79b66e6dae23ee186e18d (patch)
tree68781a3a133a0c75e1b122159b11bcbbcb5007ba
parent4eb2a5282a77f7b73e1f9b94e368b6ca3b81129d (diff)
downloadrabbitmq-server-git-6e728902a8c7223a23b79b66e6dae23ee186e18d.tar.gz
cosmetic
The changes on default don't seem to impact the working of this branch.
-rw-r--r--src/rabbit_amqqueue_process.erl45
1 files changed, 21 insertions, 24 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 16d89f74e6..341d0882f4 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -1289,33 +1289,30 @@ handle_cast({deliver, Delivery = #delivery{sender = Sender,
true;
_ ->
case already_been_here(Delivery, State) of
- false ->
- true;
- Qs ->
- rabbit_log:warning(
- "Message dropped. Dead-letter queues " ++
- "cycle detected: ~p~n", [Qs]),
- rabbit_misc:confirm_to_sender(Sender, [MsgSeqNo]),
- false
+ false -> true;
+ Qs -> rabbit_log:warning(
+ "Message dropped. Dead-letter queues " ++
+ "cycle detected: ~p~n", [Qs]),
+ rabbit_misc:confirm_to_sender(Sender,
+ [MsgSeqNo]),
+ false
end
end,
case ShouldDeliver of
- false ->
- noreply(State);
- true ->
- case Flow of
- flow ->
- Key = {ch_publisher, Sender},
- case get(Key) of
- undefined -> put(Key,
- erlang:monitor(process, Sender));
- _ -> ok
- end,
- credit_flow:ack(Sender);
- noflow ->
- ok
- end,
- noreply(deliver_or_enqueue(Delivery, State))
+ false -> noreply(State);
+ true -> case Flow of
+ flow ->
+ Key = {ch_publisher, Sender},
+ case get(Key) of
+ undefined -> put(Key, erlang:monitor(process,
+ Sender));
+ _ -> ok
+ end,
+ credit_flow:ack(Sender);
+ noflow ->
+ ok
+ end,
+ noreply(deliver_or_enqueue(Delivery, State))
end;
handle_cast({ack, AckTags, ChPid}, State) ->