summaryrefslogtreecommitdiff
path: root/Assistant/Threads
diff options
context:
space:
mode:
Diffstat (limited to 'Assistant/Threads')
-rw-r--r--Assistant/Threads/MountWatcher.hs2
-rw-r--r--Assistant/Threads/Pusher.hs2
-rw-r--r--Assistant/Threads/TransferScanner.hs6
-rw-r--r--Assistant/Threads/TransferWatcher.hs2
4 files changed, 6 insertions, 6 deletions
diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs
index 79fcce08c..462f5843c 100644
--- a/Assistant/Threads/MountWatcher.hs
+++ b/Assistant/Threads/MountWatcher.hs
@@ -174,7 +174,7 @@ remotesUnder st dstatus dir = runThreadState st $ do
let (waschanged, rs') = unzip pairs
when (any id waschanged) $ do
Annex.changeState $ \s -> s { Annex.remotes = rs' }
- updateKnownRemotes dstatus
+ updateSyncRemotes dstatus
return $ map snd $ filter fst pairs
where
checkremote repotop r = case Remote.localpath r of
diff --git a/Assistant/Threads/Pusher.hs b/Assistant/Threads/Pusher.hs
index dee563d74..4f3a2dd09 100644
--- a/Assistant/Threads/Pusher.hs
+++ b/Assistant/Threads/Pusher.hs
@@ -52,7 +52,7 @@ pushThread st dstatus commitchan pushmap = thread $ runEvery (Seconds 2) $ do
now <- getCurrentTime
if shouldPush now commits
then do
- remotes <- filter pushable . knownRemotes
+ remotes <- filter pushable . syncRemotes
<$> getDaemonStatus dstatus
unless (null remotes) $
void $ alertWhile dstatus (pushAlert remotes) $
diff --git a/Assistant/Threads/TransferScanner.hs b/Assistant/Threads/TransferScanner.hs
index 8f44f24d1..bc5837529 100644
--- a/Assistant/Threads/TransferScanner.hs
+++ b/Assistant/Threads/TransferScanner.hs
@@ -61,7 +61,7 @@ transferScannerThread st dstatus scanremotes transferqueue = thread $ do
- lost.
-}
startupScan = addScanRemotes scanremotes True
- =<< knownRemotes <$> getDaemonStatus dstatus
+ =<< syncRemotes <$> getDaemonStatus dstatus
{- This is a cheap scan for failed transfers involving a remote. -}
failedTransferScan :: ThreadState -> DaemonStatusHandle -> TransferQueue -> Remote -> IO ()
@@ -117,8 +117,8 @@ expensiveScan st dstatus transferqueue rs = unless onlyweb $ do
{- Queue transfers from any known remote. The known
- remotes may have changed since this scan began. -}
let use a = do
- knownrs <- liftIO $ knownRemotes <$> getDaemonStatus dstatus
- return $ catMaybes $ map (a key locs) knownrs
+ syncrs <- liftIO $ syncRemotes <$> getDaemonStatus dstatus
+ return $ catMaybes $ map (a key locs) syncrs
ifM (inAnnex key)
( filterM (wantSend (Just f) . Remote.uuid . fst)
=<< use (check Upload False)
diff --git a/Assistant/Threads/TransferWatcher.hs b/Assistant/Threads/TransferWatcher.hs
index 16d247860..95a594d5d 100644
--- a/Assistant/Threads/TransferWatcher.hs
+++ b/Assistant/Threads/TransferWatcher.hs
@@ -67,7 +67,7 @@ onAdd st dstatus _ file _ = case parseTransferFile file of
[ "transfer starting:"
, show t
]
- r <- headMaybe . filter (sameuuid t) . knownRemotes
+ r <- headMaybe . filter (sameuuid t) . syncRemotes
<$> getDaemonStatus dstatus
updateTransferInfo dstatus t info
{ transferRemote = r }