summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-07-16 08:04:12 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-07-16 08:04:12 +0100
commit073f7f4b99b8a99611eab6b429445e54939faadd (patch)
tree7f1e816d3168cffbf70968ae364f9f6c1c4ba8a3
parent4e39ae382302832d9353fd28d78944f543fe083f (diff)
downloadrabbitmq-server-073f7f4b99b8a99611eab6b429445e54939faadd.tar.gz
refactor: trim args for msg_store_callback
we only ever need a msg_store_callback when we have persisted pubs
-rw-r--r--src/rabbit_variable_queue.erl7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index f32c98ba..5344b72a 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -563,7 +563,7 @@ tx_commit(Txn, Fun, State = #vqstate { durable = IsDurable }) ->
IsTransientPubs, PubsOrdered, AckTags1, Fun, State);
false -> ok = rabbit_msg_store:sync(
?PERSISTENT_MSG_STORE, PersistentGuids,
- msg_store_callback(PersistentGuids, IsTransientPubs,
+ msg_store_callback(PersistentGuids,
PubsOrdered, AckTags1, Fun)),
State
end)}.
@@ -823,12 +823,11 @@ update_rate(Now, Then, Count, {OThen, OCount}) ->
%% Internal major helpers for Public API
%%----------------------------------------------------------------------------
-msg_store_callback(PersistentGuids, IsTransientPubs, Pubs, AckTags, Fun) ->
+msg_store_callback(PersistentGuids, Pubs, AckTags, Fun) ->
Self = self(),
F = fun () -> rabbit_amqqueue:maybe_run_queue_via_backing_queue(
Self, fun (StateN) -> tx_commit_post_msg_store(
- IsTransientPubs, Pubs,
- AckTags, Fun, StateN)
+ false, Pubs, AckTags, Fun, StateN)
end)
end,
fun () -> spawn(fun () -> ok = rabbit_misc:with_exit_handler(