diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-04-18 12:18:49 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-04-18 12:18:49 +0100 |
| commit | 3f8a89eed73fdef9dd0df51a744449e69d31ce0f (patch) | |
| tree | 08a36a98300a0be7971ebaa745224e388b5278c3 /src | |
| parent | 28c6ed4a02943e19ce9c65f9a856f463f27a79d6 (diff) | |
| download | rabbitmq-server-git-3f8a89eed73fdef9dd0df51a744449e69d31ce0f.tar.gz | |
A cosmetic and a missing infinity timeout on a call
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_msg_store.erl | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 9406008e29..d705909a48 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -167,7 +167,7 @@ recover_durable_queues(DurableQueues) -> end, [], DurableQueues), %% Issue inits to *all* the queues so that they all init at the same time [ok = gen_server2:cast(Q#amqqueue.pid, init_backing_queue) || Q <- Qs], - [ok = gen_server2:call(Q#amqqueue.pid, sync) || Q <- Qs], + [ok = gen_server2:call(Q#amqqueue.pid, sync, infinity) || Q <- Qs], Qs. declare(QueueName, Durable, AutoDelete, Args) -> diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index eb3a5db0a5..74b81f6156 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -1370,8 +1370,7 @@ build_index(Gatherer, Left, [File|Files], State) -> build_index_worker( Gatherer, Ref, State = #msstate { dir = Dir }, Left, File, Files) -> {ok, Messages, FileSize} = - scan_file_for_valid_messages( - Dir, filenum_to_name(File)), + scan_file_for_valid_messages(Dir, filenum_to_name(File)), {ValidMessages, ValidTotalSize} = lists:foldl( fun (Obj = {Guid, TotalSize, Offset}, {VMAcc, VTSAcc}) -> |