aboutsummaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-27 00:50:14 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-27 00:50:14 -0400
commite359a06cf6f422660e1c05e6f50a812d41c535c9 (patch)
tree5e1ee6dd4902df89edcf85c820b306fe38565549 /Assistant
parentce5b38aa1dbd1e320c5247d95344e373bf03e7cf (diff)
(re)start XMPP when it's configured in the webapp
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/WebApp.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs
index 5eda88d36..7657fc7b8 100644
--- a/Assistant/Threads/WebApp.hs
+++ b/Assistant/Threads/WebApp.hs
@@ -32,6 +32,7 @@ import Assistant.DaemonStatus
import Assistant.ScanRemotes
import Assistant.TransferQueue
import Assistant.TransferSlots
+import Assistant.Pushes
import Utility.WebApp
import Utility.FileMode
import Utility.TempFile
@@ -55,17 +56,19 @@ webAppThread
-> ScanRemoteMap
-> TransferQueue
-> TransferSlots
+ -> PushNotifier
-> UrlRenderer
-> Maybe (IO String)
-> Maybe (Url -> FilePath -> IO ())
-> NamedThread
-webAppThread mst dstatus scanremotes transferqueue transferslots urlrenderer postfirstrun onstartup = thread $ do
+webAppThread mst dstatus scanremotes transferqueue transferslots pushnotifier urlrenderer postfirstrun onstartup = thread $ do
webapp <- WebApp
<$> pure mst
<*> pure dstatus
<*> pure scanremotes
<*> pure transferqueue
<*> pure transferslots
+ <*> pure pushnotifier
<*> (pack <$> genRandomToken)
<*> getreldir mst
<*> pure $(embed "static")