immediate queue flushing when annex.queuesize=1

Previously, it only flushed when the queue got larger than 1.

Also, make the queue auto-flush when items are added, rather than needing
to be flushed as a separate step. This simplifies the code and make it more
efficient too, as it avoids needing to read the queue out of the state to
check if it should be flushed.
This commit is contained in:
Joey Hess 2016-01-13 14:55:01 -04:00
parent 1d5b70db9c
commit b52cf5697b
Failed to extract signature
5 changed files with 21 additions and 23 deletions

View file

@ -119,11 +119,8 @@ findFreeSlot = go []
{- Like commandAction, but without the concurrency. -}
includeCommandAction :: CommandStart -> CommandCleanup
includeCommandAction a = account =<< tryIO go
includeCommandAction a = account =<< tryIO (callCommandAction a)
where
go = do
Annex.Queue.flushWhenFull
callCommandAction a
account (Right True) = return True
account (Right False) = incerr
account (Left err) = do