seang96/gmessages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Count remote echo timeouts from ack instead of event ts

Browse source
This commit is contained in:
Tulir Asokan 2024-06-08 12:47:41 +03:00
parent 5333dcbbe9
commit 0c7e11d8f0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
portal.go
View file

@ -254,7 +254,7 @@ type PortalMatrixMessage struct {
type outgoingMessage struct { type outgoingMessage struct {
*event.Event *event.Event
Acked bool AckedAt time.Time
Errored bool Errored bool
Timeouted bool Timeouted bool
} }
@ -390,7 +390,7 @@ func (portal *Portal) outgoingMessageTimeoutLoop() {
for range ticker.C { for range ticker.C {
portal.outgoingMessagesLock.Lock() portal.outgoingMessagesLock.Lock()
for _, out := range portal.outgoingMessages { for _, out := range portal.outgoingMessages {
if !out.Timeouted && out.Acked && !out.Errored && time.Since(time.UnixMilli(out.Timestamp)) > 1*time.Minute { if !out.Timeouted && !out.AckedAt.IsZero() && !out.Errored && time.Since(out.AckedAt) > 1*time.Minute {
go portal.sendStatusEvent(context.TODO(), out.ID, "", errEchoTimeout, nil) go portal.sendStatusEvent(context.TODO(), out.ID, "", errEchoTimeout, nil)
go portal.sendErrorMessage(context.TODO(), out.Event, errEchoTimeout, "message", false, "") go portal.sendErrorMessage(context.TODO(), out.Event, errEchoTimeout, "message", false, "")
go portal.bridge.SendMessageCheckpoint(out.Event, status.MsgStepRemote, errEchoTimeout, status.MsgStatusTimeout, 0) go portal.bridge.SendMessageCheckpoint(out.Event, status.MsgStepRemote, errEchoTimeout, status.MsgStatusTimeout, 0)
@ -2110,10 +2110,10 @@ func (portal *Portal) HandleMatrixMessage(sender *User, evt *event.Event, timing
go ms.sendMessageMetrics(ctx, sender, evt, err, "Error sending", true) go ms.sendMessageMetrics(ctx, sender, evt, err, "Error sending", true)
} else if resp.Status != gmproto.SendMessageResponse_SUCCESS { } else if resp.Status != gmproto.SendMessageResponse_SUCCESS {
outgoingMsg.Errored = true outgoingMsg.Errored = true
outgoingMsg.Acked = true outgoingMsg.AckedAt = time.Now()
go ms.sendMessageMetrics(ctx, sender, evt, (*responseStatusError)(resp), "Error sending", true) go ms.sendMessageMetrics(ctx, sender, evt, (*responseStatusError)(resp), "Error sending", true)
} else { } else {
outgoingMsg.Acked = true outgoingMsg.AckedAt = time.Now()
go ms.sendMessageMetrics(ctx, sender, evt, nil, "", true) go ms.sendMessageMetrics(ctx, sender, evt, nil, "", true)
} }
} }