diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-05 17:44:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-05 17:44:14 -0400 |
| commit | 1db1469905cd08da2b4a2f5e310437ff5233f286 (patch) | |
| tree | dce09d0ef76f95819bfb8f3d2640c4121475c5fe /Assistant | |
| parent | f86866c6130ad7b8eb1433c976e4c94b1f17e30d (diff) | |
annex.startupscan can be set to false to disable the assistant's startup scan.
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Threads/Merger.hs | 2 | ||||
| -rw-r--r-- | Assistant/Threads/TransferWatcher.hs | 2 | ||||
| -rw-r--r-- | Assistant/Threads/UpgradeWatcher.hs | 3 | ||||
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 12489b590..03bcf0aad 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -39,7 +39,7 @@ mergeThread = namedThread "Merger" $ do , modifyHook = changehook , errHook = errhook } - void $ liftIO $ watchDir dir (const False) hooks id + void $ liftIO $ watchDir dir (const False) True hooks id debug ["watching", dir] type Handler = FilePath -> Assistant () diff --git a/Assistant/Threads/TransferWatcher.hs b/Assistant/Threads/TransferWatcher.hs index cd7282865..6e8791732 100644 --- a/Assistant/Threads/TransferWatcher.hs +++ b/Assistant/Threads/TransferWatcher.hs @@ -35,7 +35,7 @@ transferWatcherThread = namedThread "TransferWatcher" $ do , modifyHook = modifyhook , errHook = errhook } - void $ liftIO $ watchDir dir (const False) hooks id + void $ liftIO $ watchDir dir (const False) True hooks id debug ["watching for transfers"] type Handler = FilePath -> Assistant () diff --git a/Assistant/Threads/UpgradeWatcher.hs b/Assistant/Threads/UpgradeWatcher.hs index 80f2040a0..ffad09d3d 100644 --- a/Assistant/Threads/UpgradeWatcher.hs +++ b/Assistant/Threads/UpgradeWatcher.hs @@ -50,8 +50,9 @@ upgradeWatcherThread urlrenderer = namedThread "UpgradeWatcher" $ do let dir = parentDir flagfile let depth = length (splitPath dir) + 1 let nosubdirs f = length (splitPath f) == depth - void $ liftIO $ watchDir dir nosubdirs hooks (startup mvar) + void $ liftIO $ watchDir dir nosubdirs False hooks (startup mvar) -- Ignore bogus events generated during the startup scan. + -- We ask the watcher to not generate them, but just to be safe.. startup mvar scanner = do r <- scanner void $ swapMVar mvar Started diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 611eca1a7..8a8e8faf0 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -102,7 +102,8 @@ runWatcher = do , delDirHook = deldirhook , errHook = errhook } - handle <- liftIO $ watchDir "." ignored hooks startup + scanevents <- liftAnnex $ annexStartupScan <$> Annex.getGitConfig + handle <- liftIO $ watchDir "." ignored scanevents hooks startup debug [ "watching", "."] {- Let the DirWatcher thread run until signalled to pause it, |