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

run checkCanWatch before redirecting errors to log

Browse source 
This was handled ok in daemon mode, but not in foreground mode.
This commit is contained in:
Joey Hess 2013-05-09 12:02:31 -04:00
parent 1c1b8da5a3
commit 5faecdcb1d
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Assistant.hs
View file

@ -177,15 +177,17 @@ startDaemon assistant foreground listenhost startbrowser = do
logfd <- liftIO $ openLog logfile logfd <- liftIO $ openLog logfile
if foreground if foreground
then do then do
liftIO $ debugM desc $ "logging to " ++ logfile showStart "." desc
liftIO $ Utility.Daemon.lockPidFile pidfile
origout <- liftIO $ catchMaybeIO $ origout <- liftIO $ catchMaybeIO $
fdToHandle =<< dup stdOutput fdToHandle =<< dup stdOutput
origerr <- liftIO $ catchMaybeIO $ origerr <- liftIO $ catchMaybeIO $
fdToHandle =<< dup stdError fdToHandle =<< dup stdError
liftIO $ Utility.LogFile.redirLog logfd let undaemonize a = do
showStart "." desc debugM desc $ "logging to " ++ logfile
start id $ Utility.Daemon.lockPidFile pidfile
Utility.LogFile.redirLog logfd
a
start undaemonize $
case startbrowser of case startbrowser of
Nothing -> Nothing Nothing -> Nothing
Just a -> Just $ a origout origerr Just a -> Just $ a origout origerr