lovely-projects/mautrix-signal
lovely-projects/mautrix-signal
1
0
Fork 0
mirror of https://github.com/mautrix/signal.git synced 2025-03-14 14:15:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

client: don't propagate background timeouts if connection was successful

Browse source
This commit is contained in:
Tulir Asokan 2025-03-04 14:49:17 +02:00
parent 870f0d152e
commit 9e7a24a7ba
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/connector/client.go
View file

@ -228,12 +228,14 @@ func (s *SignalClient) ConnectBackground(ctx context.Context, _ *bridgev2.Connec
defer s.Disconnect()
log := zerolog.Ctx(ctx)
queueEmpty := s.queueEmptyWaiter.GetChan()
didConnect := false
for {
select {
case status := <-ch:
switch status.Event {
case web.SignalWebsocketConnectionEventConnected:
log.Info().Msg("Authed websocket connected")
didConnect = true
case web.SignalWebsocketConnectionEventDisconnected:
log.Err(status.Err).Msg("Authed websocket disconnected")
case web.SignalWebsocketConnectionEventLoggedOut:
@ -247,6 +249,10 @@ func (s *SignalClient) ConnectBackground(ctx context.Context, _ *bridgev2.Connec
}
case <-ctx.Done():
log.Warn().Msg("Context finished before queue empty event")
if didConnect {
// Don't propagate timeout errors if the connection was successful at least once
return nil
}
return ctx.Err()
case <-queueEmpty:
log.Info().Msg("Received queue empty event")