diff options
| author | Joey Hess <joey@kitenet.net> | 2012-10-29 11:40:22 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-29 11:40:22 -0400 |
| commit | 76768ad9772557aee5bc4d78ed08075791e680aa (patch) | |
| tree | 0c4a376bfc14a1ba056f9e280b02e20570f49abe /Assistant.hs | |
| parent | bad88e404a8d724a2a01dbdbd9c2ad6e50bb2fe8 (diff) | |
converted 6 more threads
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/Assistant.hs b/Assistant.hs index 07f022aa6f..be4cbeb9c4 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -182,26 +182,24 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do dstatus <- getAssistant daemonStatusHandle changechan <- getAssistant changeChan commitchan <- getAssistant commitChan - pushmap <- getAssistant failedPushMap transferqueue <- getAssistant transferQueue transferslots <- getAssistant transferSlots scanremotes <- getAssistant scanRemoteMap - branchhandle <- getAssistant branchChangeHandle pushnotifier <- getAssistant pushNotifier #ifdef WITH_WEBAPP urlrenderer <- liftIO newUrlRenderer #endif mapM_ (startthread d) - [ watch $ commitThread st changechan commitchan transferqueue dstatus + [ watch $ commitThread #ifdef WITH_WEBAPP , assist $ webAppThread d urlrenderer False Nothing webappwaiter #ifdef WITH_PAIRING , assist $ pairListenerThread st dstatus scanremotes urlrenderer #endif #endif - , assist $ pushThread st dstatus commitchan pushmap pushnotifier - , assist $ pushRetryThread st dstatus pushmap pushnotifier - , assist $ mergeThread st dstatus transferqueue branchhandle + , assist $ pushThread + , assist $ pushRetryThread + , assist $ mergeThread , assist $ transferWatcherThread st dstatus transferqueue , assist $ transferPollerThread , assist $ transfererThread st dstatus transferqueue transferslots commitchan @@ -210,10 +208,10 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do , assist $ mountWatcherThread st dstatus scanremotes pushnotifier , assist $ netWatcherThread , assist $ netWatcherFallbackThread - , assist $ transferScannerThread st dstatus scanremotes transferqueue - , assist $ configMonitorThread st dstatus branchhandle commitchan + , assist $ transferScannerThread + , assist $ configMonitorThread #ifdef WITH_XMPP - , assist $ pushNotifierThread st dstatus pushnotifier + , assist $ pushNotifierThread #endif , watch $ watchThread ] |