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

better handling of lifting from XMPP -> Assistant

Browse source
This commit is contained in:
Joey Hess 2012-11-05 19:39:08 -04:00
parent fdb6a88877
commit 8f08aa3f45
7 changed files with 81 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Assistant.hs
View file

@ -177,7 +177,7 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do
checkCanWatch
dstatus <- startDaemonStatus
liftIO $ daemonize $
runAssistant go =<< newAssistantData st dstatus
flip runAssistant go =<< newAssistantData st dstatus
where
go = do
d <- getAssistant id
@ -216,6 +216,5 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do
assist a = (False, a)
startthread d (watcher, t)
| watcher || assistant = void $ liftIO $ forkIO $
flip runAssistant d $
runNamedThread t
runAssistant d $ runNamedThread t
| otherwise = noop