summaryrefslogtreecommitdiff
path: root/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-08 16:44:23 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-08 16:46:29 -0400
commitf9bf6fbcb9ef2d4afc51b60387d58db6b5cb401a (patch)
tree68a08e40f572520c24814d7bacc4271aca32b1dd /Assistant.hs
parente146cc372b8daa70fa093c9f27cedf7188ce72fc (diff)
xmpp push control flow
It might even work, although nothing yet triggers XMPP pushes. Also added a set of deferred push messages. Only one push can run at a time, and unrelated push messages get deferred. The set will never grow very large, because it only puts two types of messages in there, that can only vary in the client doing the push.
Diffstat (limited to 'Assistant.hs')
-rw-r--r--Assistant.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Assistant.hs b/Assistant.hs
index 55641b90e..5b3dd9cb9 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -105,10 +105,10 @@
- BranchChanged (STM SampleVar)
- Changes to the git-annex branch are indicated by updating this
- SampleVar.
- - NetMessager (STM TChan, SampleVar)
- - Used to feed messages to the built-in XMPP client, and
- - signal it when it needs to restart due to configuration or
- - networking changes.
+ - NetMessager (STM TChan, TMVar, SampleVar)
+ - Used to feed messages to the built-in XMPP client, handle
+ - pushes, and signal it when it needs to restart due to configuration
+ - or networking changes.
- UrlRenderer (MVar)
- A Yesod route rendering function is stored here. This allows
- things that need to render Yesod routes to block until the webapp