diff options
| author | Joey Hess <joey@kitenet.net> | 2013-04-03 17:44:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-03 17:48:54 -0400 |
| commit | 021c564319d059dcf658d4d2e4af2d20f011a961 (patch) | |
| tree | cd8a5cf14affdc7047c8d7c27d144a5df7d9b585 /Assistant.hs | |
| parent | 9a5f4217684aaf6ff2c803b62acbed95ef08a22a (diff) | |
clean up urlrenderer handling when the webapp is not built
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Assistant.hs b/Assistant.hs index ba2916fbf7..a436070b37 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -154,6 +154,7 @@ import Assistant.Threads.XMPPClient #warning Building without the webapp. You probably need to install Yesod.. #endif import Assistant.Environment +import Assistant.Types.UrlRenderer import qualified Utility.Daemon import Utility.LogFile import Utility.ThreadScheduler @@ -205,15 +206,16 @@ startDaemon assistant foreground startbrowser = do flip runAssistant (go webappwaiter) =<< newAssistantData st dstatus - go webappwaiter = do - notice ["starting", desc, "version", SysConfig.packageversion] + #ifdef WITH_WEBAPP + go webappwaiter = do d <- getAssistant id - urlrenderer <- liftIO newUrlRenderer - mapM_ (startthread $ Just urlrenderer) #else - mapM_ (startthread Nothing) + go _webappwaiter = do #endif + notice ["starting", desc, "version", SysConfig.packageversion] + urlrenderer <- liftIO newUrlRenderer + mapM_ (startthread urlrenderer) [ watch $ commitThread #ifdef WITH_WEBAPP , assist $ webAppThread d urlrenderer False Nothing webappwaiter |