diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-12-20 13:37:06 +0000 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-12-20 13:37:06 +0000 |
| commit | b3fb3813834ca74e1d770615fbafe225e222c3b2 (patch) | |
| tree | 8c4432672155b590e78cc9f1f1a0febb1010d758 | |
| parent | da082d1a4ad4bd73a6a6f1c4bf4dbf11c823cef6 (diff) | |
| download | rabbitmq-server-git-b3fb3813834ca74e1d770615fbafe225e222c3b2.tar.gz | |
remove confirming of undelivered immediate messages from amqqueue_process
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_msg_store.erl | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 981dd31daa..29d52fec3c 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -840,10 +840,7 @@ handle_call({deliver_immediately, Delivery = #delivery{message = Message}}, %% {Delivered, State1} = attempt_delivery(Delivery, record_confirm_message(Delivery, State)), - reply(Delivered, case Delivered of - true -> State1; - false -> confirm_message(Message, State1) - end); + reply(Delivered, State1); handle_call({deliver, Delivery}, _From, State) -> %% Synchronous, "mandatory" delivery mode diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index e8b4e8e270..f0934d487d 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -875,7 +875,7 @@ internal_sync(State = #msstate { current_file_handle = CurHdl, true -> file_handle_cache:sync(CurHdl) end, lists:foreach(fun (K) -> K() end, lists:reverse(Syncs)), - [client_confirm(CRef, Guids, State1) || {CRef, Guids} <- CGs], + %%[client_confirm(CRef, Guids, State1) || {CRef, Guids} <- CGs], State1 #msstate { cref_to_guids = dict:new(), on_sync = [] }. |