mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

startup check fixes

Browse source 
Move lsof check, and display a message before daemon startup if on an
unsupported OS.
This commit is contained in:
Joey Hess 2012-06-17 14:02:58 -04:00
parent e84b78f40c
commit 1863185693
2 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Assistant.hs
View file

@ -49,7 +49,6 @@ import Assistant.DaemonStatus
import Assistant.Watcher import Assistant.Watcher
import Assistant.Committer import Assistant.Committer
import Assistant.SanityChecker import Assistant.SanityChecker
import qualified Annex
import qualified Utility.Daemon import qualified Utility.Daemon
import Utility.LogFile import Utility.LogFile
@ -65,12 +64,8 @@ startDaemon foreground
pidfile <- fromRepo gitAnnexPidFile pidfile <- fromRepo gitAnnexPidFile
go $ Utility.Daemon.daemonize logfd (Just pidfile) False go $ Utility.Daemon.daemonize logfd (Just pidfile) False
where where
go a = ifM (liftIO $ inPath "lsof") go a = withThreadState $ \st -> do
( go a checkCanWatch
, ifM (Annex.getState Annex.force)
(start a, needlsof)
)
start a = withThreadState $ \st -> do
dstatus <- startDaemonStatus dstatus <- startDaemonStatus
liftIO $ a $ do liftIO $ a $ do
changechan <- newChangeChan changechan <- newChangeChan
@ -84,12 +79,5 @@ startDaemon foreground
_ <- forkIO $ sanityCheckerThread st dstatus changechan _ <- forkIO $ sanityCheckerThread st dstatus changechan
watchThread st dstatus changechan watchThread st dstatus changechan
needlsof = error $ unlines
[ "The lsof command is needed for watch mode to be safe, and is not in PATH."
, "To override lsof checks to ensure that files are not open for writing"
, "when added to the annex, you can use --force"
, "Be warned: This can corrupt data in the annex, and make fsck complain."
]
stopDaemon :: Annex () stopDaemon :: Annex ()
stopDaemon = liftIO . Utility.Daemon.stopDaemon =<< fromRepo gitAnnexPidFile stopDaemon = liftIO . Utility.Daemon.stopDaemon =<< fromRepo gitAnnexPidFile

22
Assistant/Watcher.hs
View file

@ -13,13 +13,14 @@ import Common.Annex
import Assistant.ThreadedMonad import Assistant.ThreadedMonad
import Assistant.DaemonStatus import Assistant.DaemonStatus
import Assistant.Committer import Assistant.Committer
import Utility.ThreadLock import Utility.ThreadScheduler
import qualified Annex.Queue import qualified Annex.Queue
import qualified Git.Command import qualified Git.Command
import qualified Git.UpdateIndex import qualified Git.UpdateIndex
import qualified Git.HashObject import qualified Git.HashObject
import qualified Git.LsFiles import qualified Git.LsFiles
import qualified Backend import qualified Backend
import qualified Annex
import Annex.Content import Annex.Content
import Annex.CatFile import Annex.CatFile
import Git.Types import Git.Types
@ -35,6 +36,23 @@ import System.INotify
type Handler = FilePath -> Maybe FileStatus -> DaemonStatusHandle -> Annex (Maybe Change) type Handler = FilePath -> Maybe FileStatus -> DaemonStatusHandle -> Annex (Maybe Change)
checkCanWatch :: Annex ()
checkCanWatch = do
#if defined linux_HOST_OS
unlessM (liftIO (inPath "lsof") <||> Annex.getState Annex.force) $
needLsof
#else
error "watch mode is currently only available in Linux"
#endif
needLsof :: Annex ()
needLsof = error $ unlines
[ "The lsof command is needed for watch mode to be safe, and is not in PATH."
, "To override lsof checks to ensure that files are not open for writing"
, "when added to the annex, you can use --force"
, "Be warned: This can corrupt data in the annex, and make fsck complain."
]
watchThread :: ThreadState -> DaemonStatusHandle -> ChangeChan -> IO () watchThread :: ThreadState -> DaemonStatusHandle -> ChangeChan -> IO ()
#if defined linux_HOST_OS #if defined linux_HOST_OS
watchThread st dstatus changechan = withINotify $ \i -> do watchThread st dstatus changechan = withINotify $ \i -> do
@ -61,7 +79,7 @@ watchThread st dstatus changechan = withINotify $ \i -> do
, errHook = hook onErr , errHook = hook onErr
} }
#else #else
watchThread = error "so far only available on Linux" watchThread = undefined
#endif #endif
ignored :: FilePath -> Bool ignored :: FilePath -> Bool