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 | 72b25b61e9c91668e0c05a17c50462b822885eb8 (patch) | |
tree | 73a82d2033d792c0a216ce6c0e45bd1fa126b8ff /Assistant.hs | |
parent | f768f16999d997077be98c0d8eabd3d85fd8caa5 (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 ba2916fbf..a436070b3 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 |