diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-01 17:01:04 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-01 17:01:04 -0400 |
| commit | bdd5fe4170afe3e6ca0cd2f72c1522d2cf4f8bb1 (patch) | |
| tree | 316d0e78e7e56c54735abc81a69e7ddfa220cb4f /Assistant.hs | |
| parent | d7a2600edd1989934c61ae5a80fdc2ee385d49c5 (diff) | |
fix the watch command to not run the whole assistant
heh :)
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/Assistant.hs b/Assistant.hs index 21414e721..6af6c6639 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -152,20 +152,25 @@ startAssistant assistant daemonize webappwaiter = do transferqueue <- newTransferQueue transferslots <- newTransferSlots scanremotes <- newScanRemoteMap - mapM_ forkIO - [ commitThread st changechan commitchan transferqueue dstatus - , pushThread st dstatus commitchan pushmap - , pushRetryThread st dstatus pushmap - , mergeThread st - , transferWatcherThread st dstatus - , transfererThread st dstatus transferqueue transferslots - , daemonStatusThread st dstatus - , sanityCheckerThread st dstatus transferqueue changechan - , mountWatcherThread st dstatus scanremotes - , transferScannerThread st dstatus scanremotes transferqueue + mapM_ startthread + [ watch $ commitThread st changechan commitchan transferqueue dstatus + , assist $ pushThread st dstatus commitchan pushmap + , assist $ pushRetryThread st dstatus pushmap + , assist $ mergeThread st + , assist $ transferWatcherThread st dstatus + , assist $ transfererThread st dstatus transferqueue transferslots + , assist $ daemonStatusThread st dstatus + , assist $ sanityCheckerThread st dstatus transferqueue changechan + , assist $ mountWatcherThread st dstatus scanremotes + , assist $ transferScannerThread st dstatus scanremotes transferqueue #ifdef WITH_WEBAPP - , webAppThread (Just st) dstatus transferqueue Nothing webappwaiter + , assist $ webAppThread (Just st) dstatus transferqueue Nothing webappwaiter #endif - , watchThread st dstatus transferqueue changechan + , watch $ watchThread st dstatus transferqueue changechan ] waitForTermination + watch a = (True, a) + assist a = (False, a) + startthread (watcher, a) + | watcher || assistant = void $ forkIO a + | otherwise = noop |