tag xmpp pushes with jid
This fixes the issue mentioned in the last commit. Turns out just collecting UUID of clients behind a XMPP remote is insufficient (although I should probably still do it for other reasons), because a single remote repo might be connected via both XMPP and local pairing. So a way is needed to know when a push was received from any client using a given XMPP remote over XMPP, as opposed to via ssh.
This commit is contained in:
parent
c23ea9e311
commit
cbb6e1fae4
7 changed files with 76 additions and 49 deletions
|
@ -264,7 +264,8 @@ handlePushInitiation (Pushing cid PushRequest) =
|
|||
<*> getUUID
|
||||
liftIO $ Command.Sync.updateBranch (Command.Sync.syncBranch branch) g
|
||||
debug ["pushing to", show rs]
|
||||
forM_ rs $ \r -> xmppPush cid $ taggedPush u branch r
|
||||
selfjid <- ((T.unpack <$>) . xmppClientID) <$> getDaemonStatus
|
||||
forM_ rs $ \r -> xmppPush cid $ taggedPush u selfjid branch r
|
||||
handlePushInitiation (Pushing cid StartingPush) =
|
||||
whenXMPPRemote cid $
|
||||
void $ xmppReceivePack cid
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue