diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-17 14:58:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-17 14:58:35 -0400 |
| commit | fd17f8e97390ffa72e90a4532c10f2848764c580 (patch) | |
| tree | 3ff329e640a11b6c3ef62859896e7390dd23b1f7 /Assistant.hs | |
| parent | 9ed7e9be8f32b3795c5252641a11f3500a6dea28 (diff) | |
webapp: Check annex.version.
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 69 |
1 files changed, 38 insertions, 31 deletions
diff --git a/Assistant.hs b/Assistant.hs index 3f4c4fabd..00746b785 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -64,8 +64,8 @@ stopDaemon = liftIO . Utility.Daemon.stopDaemon =<< fromRepo gitAnnexPidFile - - startbrowser is passed the url and html shim file, as well as the original - stdout and stderr descriptors. -} -startDaemon :: Bool -> Bool -> Maybe Duration -> Maybe HostName -> Maybe (Maybe Handle -> Maybe Handle -> String -> FilePath -> IO ()) -> Annex () -startDaemon assistant foreground startdelay listenhost startbrowser = do +startDaemon :: Bool -> Bool -> Maybe Duration -> Maybe String -> Maybe HostName -> Maybe (Maybe Handle -> Maybe Handle -> String -> FilePath -> IO ()) -> Annex () +startDaemon assistant foreground startdelay cannotrun listenhost startbrowser = do Annex.changeState $ \s -> s { Annex.daemon = True } pidfile <- fromRepo gitAnnexPidFile logfile <- fromRepo gitAnnexLogFile @@ -117,44 +117,51 @@ startDaemon assistant foreground startdelay listenhost startbrowser = do #endif notice ["starting", desc, "version", SysConfig.packageversion] urlrenderer <- liftIO newUrlRenderer - mapM_ (startthread urlrenderer) - [ watch $ commitThread #ifdef WITH_WEBAPP - , assist $ webAppThread d urlrenderer False listenhost Nothing webappwaiter + let webappthread = [ assist $ webAppThread d urlrenderer False cannotrun listenhost Nothing webappwaiter ] +#else + let webappthread = [] +#endif + let threads = if isJust cannotrun + then webappthread + else webappthread ++ + [ watch $ commitThread +#ifdef WITH_WEBAPP #ifdef WITH_PAIRING - , assist $ pairListenerThread urlrenderer + , assist $ pairListenerThread urlrenderer #endif #ifdef WITH_XMPP - , assist $ xmppClientThread urlrenderer - , assist $ xmppSendPackThread urlrenderer - , assist $ xmppReceivePackThread urlrenderer + , assist $ xmppClientThread urlrenderer + , assist $ xmppSendPackThread urlrenderer + , assist $ xmppReceivePackThread urlrenderer #endif #endif - , assist $ pushThread - , assist $ pushRetryThread - , assist $ mergeThread - , assist $ transferWatcherThread - , assist $ transferPollerThread - , assist $ transfererThread - , assist $ daemonStatusThread - , assist $ sanityCheckerDailyThread - , assist $ sanityCheckerHourlyThread - , assist $ problemFixerThread urlrenderer + , assist $ pushThread + , assist $ pushRetryThread + , assist $ mergeThread + , assist $ transferWatcherThread + , assist $ transferPollerThread + , assist $ transfererThread + , assist $ daemonStatusThread + , assist $ sanityCheckerDailyThread + , assist $ sanityCheckerHourlyThread + , assist $ problemFixerThread urlrenderer #ifdef WITH_CLIBS - , assist $ mountWatcherThread urlrenderer + , assist $ mountWatcherThread urlrenderer #endif - , assist $ netWatcherThread - , assist $ netWatcherFallbackThread - , assist $ transferScannerThread urlrenderer - , assist $ cronnerThread urlrenderer - , assist $ configMonitorThread - , assist $ glacierThread - , watch $ watchThread - -- must come last so that all threads that wait - -- on it have already started waiting - , watch $ sanityCheckerStartupThread startdelay - ] + , assist $ netWatcherThread + , assist $ netWatcherFallbackThread + , assist $ transferScannerThread urlrenderer + , assist $ cronnerThread urlrenderer + , assist $ configMonitorThread + , assist $ glacierThread + , watch $ watchThread + -- must come last so that all threads that wait + -- on it have already started waiting + , watch $ sanityCheckerStartupThread startdelay + ] + mapM_ (startthread urlrenderer) threads liftIO waitForTermination watch a = (True, a) |