diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-10-15 16:29:48 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-10-15 16:29:48 +0100 |
| commit | 8db1447ace87f3c0a3d63bb05f1bd8566c149009 (patch) | |
| tree | 52a0982363e8103b613856facab305b8c0022c29 | |
| parent | da773f7bb2f0956b2ebcc480ca0fd84e7c1f6ee4 (diff) | |
| download | rabbitmq-server-8db1447ace87f3c0a3d63bb05f1bd8566c149009.tar.gz | |
refactor: handle all msg statuses uniformly
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 3bd787d3..6d7bc304 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -633,12 +633,7 @@ maybe_enqueue_message( MQ1 = queue:in(Delivery, MQ), SQ1 = dict:store(ChPid, {MQ1, PendingCh}, SQ), State1 #state { sender_queues = SQ1 }; - {ok, confirmed} -> - ok = rabbit_misc:confirm_to_sender(ChPid, [MsgSeqNo]), - SQ1 = remove_from_pending_ch(MsgId, ChPid, SQ), - State1 #state { msg_id_status = dict:erase(MsgId, MS), - sender_queues = SQ1 }; - {ok, Status} when Status =:= published orelse Status =:= discarded -> + {ok, Status} -> MS1 = case needs_confirming(Status, Delivery, State1) of never -> dict:erase(MsgId, MS); eventually -> MMS = {Status, ChPid, MsgSeqNo}, |