diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-09-04 15:50:30 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-09-04 15:50:30 +0100 |
| commit | 21e56db755e099dc5a3c0bf160acd5843768959c (patch) | |
| tree | c2d00a83468cb485fe39c6119a7de47e10e359e7 | |
| parent | 6aa05574966662c78d4ba60474d3718ba7aac669 (diff) | |
| download | rabbitmq-server-git-21e56db755e099dc5a3c0bf160acd5843768959c.tar.gz | |
remove differences with default
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index ee65a0a79a..190a0139f8 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -767,16 +767,18 @@ process_instruction( SQ1 = dict:store(ChPid, {MQ1, PendingCh1}, SQ), State2 = State1 #state { sender_queues = SQ1, msg_id_status = MS1 }, - {ok, case Deliver of - false -> - BQS1 = BQ:publish(Msg, MsgProps, ChPid, BQS), - State2 #state { backing_queue_state = BQS1 }; - {true, AckRequired} -> - {AckTag, BQS1} = BQ:publish_delivered( - AckRequired, Msg, MsgProps, ChPid, BQS), - maybe_store_ack(AckRequired, MsgId, AckTag, - State2 #state {backing_queue_state = BQS1}) - end}; + + {ok, + case Deliver of + false -> + BQS1 = BQ:publish(Msg, MsgProps, ChPid, BQS), + State2 #state { backing_queue_state = BQS1 }; + {true, AckRequired} -> + {AckTag, BQS1} = BQ:publish_delivered(AckRequired, Msg, MsgProps, + ChPid, BQS), + maybe_store_ack(AckRequired, MsgId, AckTag, + State2 #state {backing_queue_state = BQS1}) + end}; process_instruction({discard, ChPid, Msg = #basic_message { id = MsgId }}, State = #state { sender_queues = SQ, backing_queue = BQ, |