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

fix the watch command to not run the whole assistant

Browse source 
heh :)
This commit is contained in:
Joey Hess 2012-08-01 17:01:04 -04:00
parent d7a2600edd
commit bdd5fe4170
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Assistant.hs
View file

@ -152,20 +152,25 @@ startAssistant assistant daemonize webappwaiter = do
transferqueue <- newTransferQueue transferqueue <- newTransferQueue
transferslots <- newTransferSlots transferslots <- newTransferSlots
scanremotes <- newScanRemoteMap scanremotes <- newScanRemoteMap
mapM_ forkIO mapM_ startthread
[ commitThread st changechan commitchan transferqueue dstatus [ watch $ commitThread st changechan commitchan transferqueue dstatus
, pushThread st dstatus commitchan pushmap , assist $ pushThread st dstatus commitchan pushmap
, pushRetryThread st dstatus pushmap , assist $ pushRetryThread st dstatus pushmap
, mergeThread st , assist $ mergeThread st
, transferWatcherThread st dstatus , assist $ transferWatcherThread st dstatus
, transfererThread st dstatus transferqueue transferslots , assist $ transfererThread st dstatus transferqueue transferslots
, daemonStatusThread st dstatus , assist $ daemonStatusThread st dstatus
, sanityCheckerThread st dstatus transferqueue changechan , assist $ sanityCheckerThread st dstatus transferqueue changechan
, mountWatcherThread st dstatus scanremotes , assist $ mountWatcherThread st dstatus scanremotes
, transferScannerThread st dstatus scanremotes transferqueue , assist $ transferScannerThread st dstatus scanremotes transferqueue
#ifdef WITH_WEBAPP #ifdef WITH_WEBAPP
, webAppThread (Just st) dstatus transferqueue Nothing webappwaiter , assist $ webAppThread (Just st) dstatus transferqueue Nothing webappwaiter
#endif #endif
, watchThread st dstatus transferqueue changechan , watch $ watchThread st dstatus transferqueue changechan
] ]
waitForTermination waitForTermination
watch a = (True, a)
assist a = (False, a)
startthread (watcher, a)
| watcher || assistant = void $ forkIO a
| otherwise = noop