diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-17 21:05:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-17 21:05:50 -0400 |
| commit | 3c22977e44b852ecc4d1ad2d728e5dc9071952ae (patch) | |
| tree | ef2f0d8e1635c49dea2bf4d4876e25a46981f058 /Assistant.hs | |
| parent | 7a86dc944306af4d0a707631b03ef93941ecc1be (diff) | |
deferred downloads
Now when a download is queued and there's no known remote to get it from,
it's added to a deferred download list, which will be retried later.
The Merger thread tries to queue any deferred downloads when it receives
a push to the git-annex branch.
Note that the Merger thread now also forces an update of the git-annex
branch. The assistant was not updating this branch before, and it saw a
(mostly) correct view of state, but now that incoming pushes go to
synced/git-annex, it needs to be merged in.
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant.hs b/Assistant.hs index d71dba5fe..b0a00ebe8 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -185,7 +185,7 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do #endif , assist $ pushThread st dstatus commitchan pushmap , assist $ pushRetryThread st dstatus pushmap - , assist $ mergeThread st + , assist $ mergeThread st dstatus transferqueue , assist $ transferWatcherThread st dstatus , assist $ transferPollerThread st dstatus , assist $ transfererThread st dstatus transferqueue transferslots |