diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-06-06 01:27:18 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-06-06 01:27:18 +0100 |
| commit | d29c973b4afca1944349d6ebe254519152318d28 (patch) | |
| tree | fd1e872eec4586bf49ba64accefd85dc9abf01cf | |
| parent | b166963c0ff39709650b2aa40828f450fe89e73c (diff) | |
| download | rabbitmq-server-d29c973b4afca1944349d6ebe254519152318d28.tar.gz | |
was just watching the logs go by when running tests and saw an explosion. Pretty basic typeo which hadn't been caught so far.
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 7230e09c..4e02f2e4 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -282,7 +282,7 @@ deliver_or_requeue_msgs(is_message_ready, {Len, _AcksAcc, _MsgsWithAcks}, _State deliver_or_requeue_msgs(false, {Len, AcksAcc, [{Msg, AckTag} | MsgsWithAcks]}, State) -> {{Msg, true, noack, Len}, {Len - 1, [AckTag|AcksAcc], MsgsWithAcks}, State}; deliver_or_requeue_msgs(true, {Len, AcksAcc, [{Msg, AckTag} | MsgsWithAcks]}, State) -> - {{Msg, true, AckTag, Len}, {Len - 1, [AcksAcc], MsgsWithAcks}, State}. + {{Msg, true, AckTag, Len}, {Len - 1, AcksAcc, MsgsWithAcks}, State}. block_consumers(ChPid, RoundRobin) -> %%?LOGDEBUG("~p Blocking ~p from ~p~n", [self(), ChPid, queue:to_list(RoundRobin)]), diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index a61f4c3f..4b7487b0 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -704,7 +704,8 @@ test_disk_queue() -> passed = rdq_test_purge(), passed = rdq_test_dump_queue(), rdq_virgin(), - rdq_start(), + ok = control_action(stop_app, []), + ok = control_action(start_app, []), passed. rdq_time_tx_publish_commit_deliver_ack(Qs, MsgCount, MsgSizeBytes) -> @@ -926,6 +927,7 @@ rdq_test_dump_queue() -> QList2 = [{N, Msg, 256, true, (N-1)} || N <- All], QList2 = rabbit_disk_queue:dump_queue(q), io:format("dump ok post delivery + restart~n", []), + rdq_stop(), passed. rdq_time_commands(Funcs) -> |