mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

run xmpp push actions in separate thread from xmpp client

Browse source 
Took me a while to figure out why the xmpp client was not receiving git xmpp
push messages after a push started.
This commit is contained in:
Joey Hess 2012-11-09 16:04:55 -04:00
parent 232b61e946
commit 47c032a748
2 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Assistant/Threads/XMPPClient.hs
View file

@ -96,17 +96,18 @@ xmppClient urlrenderer d = do
handle _ (GotNetMessage (NotifyPush us)) = void $ inAssistant $ pull us
handle selfjid (GotNetMessage (PairingNotification stage c u)) =
maybe noop (inAssistant . pairMsgReceived urlrenderer stage u selfjid) (parseJID c)
handle _ (GotNetMessage m@(CanPush _)) = inAssistant $
unlessM (queueNetPushMessage m) $ void $ handlePushMessage m
handle _ (GotNetMessage m@(PushRequest _)) = inAssistant $
unlessM (queueNetPushMessage m) $ void $ handlePushMessage m
handle _ (GotNetMessage m@(StartingPush _)) = inAssistant $
unlessM (queueNetPushMessage m) $ void $ handlePushMessage m
handle _ (GotNetMessage m@(CanPush _)) = handlepushmsg m
handle _ (GotNetMessage m@(PushRequest _)) = handlepushmsg m
handle _ (GotNetMessage m@(StartingPush _)) = handlepushmsg m
handle _ (GotNetMessage m) = void $ inAssistant $ queueNetPushMessage m
handle _ (Ignorable _) = noop
handle _ (Unknown _) = noop
handle _ (ProtocolError _) = noop
handlepushmsg m = inAssistant $
unlessM (queueNetPushMessage m) $
void $ forkIO <~> handlePushMessage m
data XMPPEvent
= GotNetMessage NetMessage
| PresenceMessage Presence