diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-05-22 14:52:14 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-05-22 14:52:14 -0700 |
| commit | a49322636dc8671e959f68b13791e596c65a3338 (patch) | |
| tree | 6b82ca7f4588b36b487aad5aa10fd1207256cd13 /WebSockets.hs | |
| parent | 31f68db1ac80bb163e040dcb15a0cf6009e0260c (diff) | |
| parent | dc753f6815f5b8906ae54ebee801b72c60cdef3a (diff) | |
| download | debug-me-a49322636dc8671e959f68b13791e596c65a3338.tar.gz | |
Merge tag '1.20220324'
tagging package debug-me version 1.20220324
# gpg: Signature made Thu 24 Mar 2022 09:28:11 AM MST
# gpg: using RSA key 28A500C35207EAB72F6C0F25DB12DB0FF05F8F38
# gpg: Good signature from "Joey Hess <joeyh@joeyh.name>" [full]
# Primary key fingerprint: E85A 5F63 B31D 24C1 EBF0 D81C C910 D922 2512 E3C7
# Subkey fingerprint: 28A5 00C3 5207 EAB7 2F6C 0F25 DB12 DB0F F05F 8F38
Diffstat (limited to 'WebSockets.hs')
| -rw-r--r-- | WebSockets.hs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/WebSockets.hs b/WebSockets.hs index 7a53c8c..8aec057 100644 --- a/WebSockets.hs +++ b/WebSockets.hs @@ -164,16 +164,16 @@ clientApp -> (AnyMessage -> Maybe received) -> (TMChan sent -> TMChan (MissingHashes received) -> SessionID -> IO a) -> ClientApp a -clientApp mode mksent filterreceived a conn = do +clientApp mode mksent filterreceived a conn = -- Ping every 30 seconds to avoid timeouts caused by proxies etc. - forkPingThread conn 30 - _v <- negotiateWireVersion conn - sendBinaryData conn (SelectMode ClientSends mode) - r <- receiveData conn - case r of - Ready ServerSends sid -> bracket setup cleanup (go sid) - WireProtocolError e -> error e - _ -> protocolError conn "Did not get expected Ready message from server" + withPingThread conn 30 (return ()) $ do + _v <- negotiateWireVersion conn + sendBinaryData conn (SelectMode ClientSends mode) + r <- receiveData conn + case r of + Ready ServerSends sid -> bracket setup cleanup (go sid) + WireProtocolError e -> error e + _ -> protocolError conn "Did not get expected Ready message from server" where setup = do schan <- newTMChanIO |