diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-06-24 15:14:34 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-06-24 15:14:34 +0100 |
| commit | 454a0b5f0868f9b44abd1e4dec76104b229828ed (patch) | |
| tree | c1dc93b5b8d6db159b957b90efc36cd6fa084f40 | |
| parent | 9d03553a9768c71a6e7120841d2c355595eb8e19 (diff) | |
| download | rabbitmq-server-git-454a0b5f0868f9b44abd1e4dec76104b229828ed.tar.gz | |
Yup, missed a few more too
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 6f29442b37..6ba4f29880 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -188,7 +188,7 @@ ensure_sync_timer(State = #q{sync_timer_ref = undefined, backing_queue = BQ}) -> {ok, TRef} = timer:apply_after( ?SYNC_INTERVAL, rabbit_amqqueue, maybe_run_queue_via_backing_queue, - [self(), fun (BQS) -> BQ:sync(BQS) end]), + [self(), fun (BQS) -> BQ:idle_timeout(BQS) end]), State#q{sync_timer_ref = TRef}; ensure_sync_timer(State) -> State. @@ -823,7 +823,7 @@ handle_info({'DOWN', _MonitorRef, process, DownPid, _Reason}, State) -> handle_info(timeout, State = #q{backing_queue = BQ}) -> noreply(maybe_run_queue_via_backing_queue( - fun (BQS) -> BQ:sync(BQS) end, State)); + fun (BQS) -> BQ:idle_timeout(BQS) end, State)); handle_info({'EXIT', _Pid, Reason}, State) -> {stop, Reason, State}; diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 73b4a9bee9..540ea2f4ef 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1909,7 +1909,7 @@ test_variable_queue_all_the_bits_not_covered_elsewhere() -> VQa2 = variable_queue_publish(false, 4, VQa1), {VQa3, AckTags} = variable_queue_fetch(2, false, false, 4, VQa2), VQa4 = rabbit_variable_queue:requeue(AckTags, VQa3), - VQa5 = rabbit_variable_queue:sync(VQa4), + VQa5 = rabbit_variable_queue:idle_timeout(VQa4), _VQa6 = rabbit_variable_queue:terminate(VQa5), VQa7 = rabbit_variable_queue:init(test_queue(), true, true), {empty, VQa8} = rabbit_variable_queue:fetch(false, VQa7), |