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

Add checkpoint for message handling taking long

Browse source
This commit is contained in:
Tulir Asokan 2024-05-24 12:49:16 +03:00
parent dfcc23e3a7
commit 0236ea64b6
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
messagetracking.go
View file

@ -47,6 +47,7 @@ var (
errMediaConvertFailed = errors.New("failed to convert media") errMediaConvertFailed = errors.New("failed to convert media")
errMediaReuploadFailed = errors.New("failed to upload media to google") errMediaReuploadFailed = errors.New("failed to upload media to google")
errEchoTimeout = errors.New("remote echo timeout") errEchoTimeout = errors.New("remote echo timeout")
errHandlingTakingLong = errors.New("message handling is taking long")
errIncorrectUser = errors.New("incorrect user") errIncorrectUser = errors.New("incorrect user")
errNotLoggedIn = errors.New("not logged in") errNotLoggedIn = errors.New("not logged in")
@ -99,6 +100,8 @@ func errorToStatusReason(err error) (reason event.MessageStatusReason, status ev
return event.MessageStatusTooOld, event.MessageStatusRetriable, false, true, "handling the message took too long and was cancelled" return event.MessageStatusTooOld, event.MessageStatusRetriable, false, true, "handling the message took too long and was cancelled"
case errors.Is(err, errEchoTimeout): case errors.Is(err, errEchoTimeout):
return event.MessageStatusTooOld, event.MessageStatusRetriable, false, true, "phone has not confirmed message delivery" return event.MessageStatusTooOld, event.MessageStatusRetriable, false, true, "phone has not confirmed message delivery"
case errors.Is(err, errHandlingTakingLong):
return event.MessageStatusTooOld, event.MessageStatusRetriable, false, true, "sending the message is taking long; is your phone online?"
case errors.Is(err, errTargetNotFound): case errors.Is(err, errTargetNotFound):
return event.MessageStatusGenericError, event.MessageStatusFail, true, false, "" return event.MessageStatusGenericError, event.MessageStatusFail, true, false, ""
case errors.As(err, &ose): case errors.As(err, &ose):

1
portal.go
View file

@ -374,6 +374,7 @@ func (portal *Portal) handleMatrixMessageLoopItem(msg PortalMatrixMessage) {
portal.zlog.Error(). portal.zlog.Error().
Stringer("event_id", msg.evt.ID). Stringer("event_id", msg.evt.ID).
Msg("Matrix event handling is taking over a minute, unblocking loop") Msg("Matrix event handling is taking over a minute, unblocking loop")
go portal.bridge.SendMessageCheckpoint(msg.evt, status.MsgStepRemote, errHandlingTakingLong, status.MsgStatusTimeout, 0)
} }
} }