Make Signal ping kill and rebuild websocket if it takes more than 20s

mautrix · Apr 30, 2024 · 6002392 · 6002392
1 parent 703beca
commit 6002392
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pkg/signalmeow/web/signalwebsocket.go b/pkg/signalmeow/web/signalwebsocket.go
@@ -292,9 +292,12 @@ func (s *SignalWebsocket) connectLoop(
 			for {
 				select {
 				case <-ticker.C:
-					err := ws.Ping(loopCtx)
+					pingCtx, cancel := context.WithTimeout(loopCtx, 20*time.Second)
+					err := ws.Ping(pingCtx)
+					cancel()
 					if err != nil {
-						loopCancel(fmt.Errorf("error sending keepalive: %w", err))
+						log.Err(err).Msg("Error pinging")
+						loopCancel(err)
 						return
 					}
 					log.Debug().Msg("Sent keepalive")