diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-29 14:07:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-29 14:07:12 -0400 |
| commit | 0b808465e21d667c0826f454bbe88abff79389b7 (patch) | |
| tree | 4e44a4ad43cee59eca51d90721fc93cbf3d68596 /Assistant.hs | |
| parent | 5be6ce672226df37900ddb32f29b24e6b96277a9 (diff) | |
Assistant monad, stage 3
All toplevel named threads are converted to the Assistant monad.
Some utility functions still need to be converted.
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Assistant.hs b/Assistant.hs index 5b8b236e6..a8cc0b62e 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -178,13 +178,6 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do where go = do d <- getAssistant id - st <- getAssistant threadState - dstatus <- getAssistant daemonStatusHandle - commitchan <- getAssistant commitChan - transferqueue <- getAssistant transferQueue - transferslots <- getAssistant transferSlots - scanremotes <- getAssistant scanRemoteMap - pushnotifier <- getAssistant pushNotifier #ifdef WITH_WEBAPP urlrenderer <- liftIO newUrlRenderer #endif @@ -193,7 +186,7 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do #ifdef WITH_WEBAPP , assist $ webAppThread d urlrenderer False Nothing webappwaiter #ifdef WITH_PAIRING - , assist $ pairListenerThread st dstatus scanremotes urlrenderer + , assist $ pairListenerThread urlrenderer #endif #endif , assist $ pushThread @@ -201,7 +194,7 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do , assist $ mergeThread , assist $ transferWatcherThread , assist $ transferPollerThread - , assist $ transfererThread st dstatus transferqueue transferslots commitchan + , assist $ transfererThread , assist $ daemonStatusThread , assist $ sanityCheckerThread , assist $ mountWatcherThread |