diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-22 15:37:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-22 15:37:26 -0400 |
| commit | 546ba8b7e1cf6b99f38aa0619397463422837ce0 (patch) | |
| tree | 37ec7ad46a5563b05de3c6bcdf91415486eafe4e /Assistant | |
| parent | 5c3e14649ee7c404f86a1b82b648d896762cbbc2 (diff) | |
better name
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Sync.hs | 6 | ||||
| -rw-r--r-- | Assistant/Threads/MountWatcher.hs | 2 | ||||
| -rw-r--r-- | Assistant/Threads/NetWatcher.hs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs index b0f3890ee..42f82e9ab 100644 --- a/Assistant/Sync.hs +++ b/Assistant/Sync.hs @@ -31,9 +31,9 @@ import qualified Data.Map as M - if the git-annex branches of the remotes have diverged from the - local git-annex branch. -} -syncRemotes :: ThreadName -> ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> [Remote] -> IO () -syncRemotes _ _ _ _ [] = noop -syncRemotes threadname st dstatus scanremotes rs = void $ +reconnectRemotes :: ThreadName -> ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> [Remote] -> IO () +reconnectRemotes _ _ _ _ [] = noop +reconnectRemotes threadname st dstatus scanremotes rs = void $ alertWhile dstatus (syncAlert rs) $ do sync =<< runThreadState st (inRepo Git.Branch.current) where diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs index 3de594093..56b2b7c70 100644 --- a/Assistant/Threads/MountWatcher.hs +++ b/Assistant/Threads/MountWatcher.hs @@ -142,7 +142,7 @@ handleMounts st dstatus scanremotes wasmounted nowmounted = handleMount :: ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> FilePath -> IO () handleMount st dstatus scanremotes dir = do debug thisThread ["detected mount of", dir] - syncRemotes thisThread st dstatus scanremotes + reconnectRemotes thisThread st dstatus scanremotes =<< filter (Git.repoIsLocal . Remote.repo) <$> remotesUnder st dstatus dir diff --git a/Assistant/Threads/NetWatcher.hs b/Assistant/Threads/NetWatcher.hs index ffe9e1e0a..500eff1ce 100644 --- a/Assistant/Threads/NetWatcher.hs +++ b/Assistant/Threads/NetWatcher.hs @@ -124,7 +124,7 @@ pollingThread st dstatus scanremotes = runEvery (Seconds 3600) $ handleConnection :: ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> IO () handleConnection st dstatus scanremotes = do - syncRemotes thisThread st dstatus scanremotes =<< + reconnectRemotes thisThread st dstatus scanremotes =<< filter (Git.repoIsUrl . Remote.repo) <$> networkRemotes st |