summaryrefslogtreecommitdiff
path: root/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-25 21:26:13 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-07-25 21:26:13 -0400
commit32d3cffc4cf075d7c20fee8addc556f402e94cd2 (patch)
tree4640fa6618d6c14b652dada4d0423e56ea3a3f95 /Assistant.hs
parent03979d4d54e7b0ce76fa296e57b9b5e1820ce7b1 (diff)
run yesod, and launch webapp on startup
Diffstat (limited to 'Assistant.hs')
-rw-r--r--Assistant.hs8
1 files changed, 8 insertions, 0 deletions
diff --git a/Assistant.hs b/Assistant.hs
index 0049d3177..de996aa74 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -88,6 +88,8 @@
- are indicated by writing to this TMVar.
-}
+{-# LANGUAGE CPP #-}
+
module Assistant where
import Assistant.Common
@@ -108,6 +110,9 @@ import Assistant.Threads.Transferrer
import Assistant.Threads.SanityChecker
import Assistant.Threads.MountWatcher
import Assistant.Threads.TransferScanner
+#ifdef WITH_WEBAPP
+import Assistant.Threads.WebApp
+#endif
import qualified Utility.Daemon
import Utility.LogFile
import Utility.ThreadScheduler
@@ -146,6 +151,9 @@ startDaemon assistant foreground
, sanityCheckerThread st dstatus transferqueue changechan
, mountWatcherThread st dstatus scanremotes
, transferScannerThread st scanremotes transferqueue
+#ifdef WITH_WEBAPP
+ , webAppThread dstatus
+#endif
, watchThread st dstatus transferqueue changechan
]
debug "assistant"