This commit is contained in:
Joey Hess 2013-03-12 06:45:56 -04:00
parent ccb7e5cfa4
commit c56e8f07ba

View file

@ -178,7 +178,7 @@ startDaemon assistant foreground startbrowser = do
origerr <- liftIO $ catchMaybeIO $ origerr <- liftIO $ catchMaybeIO $
fdToHandle =<< dup stdError fdToHandle =<< dup stdError
liftIO $ Utility.LogFile.redirLog logfd liftIO $ Utility.LogFile.redirLog logfd
showStart (if assistant then "assistant" else "watch") "." showStart "." desc
start id $ start id $
case startbrowser of case startbrowser of
Nothing -> Nothing Nothing -> Nothing
@ -186,6 +186,9 @@ startDaemon assistant foreground startbrowser = do
else else
start (Utility.Daemon.daemonize logfd (Just pidfile) False) Nothing start (Utility.Daemon.daemonize logfd (Just pidfile) False) Nothing
where where
desc
| assistant = "assistant"
| otherwise = "watch"
start daemonize webappwaiter = withThreadState $ \st -> do start daemonize webappwaiter = withThreadState $ \st -> do
checkCanWatch checkCanWatch
when assistant $ checkEnvironment when assistant $ checkEnvironment