ProtonMail
/
proton-bridge
mirror of https://github.com/ProtonMail/proton-bridge
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(GODT-2866): Add 429/5xx Retry to Event Service

This commit is contained in:
Leander Beernaert 2023-08-28 14:22:13 +02:00
parent 47233752f5
commit 8aee732fe8
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/services/userevents/service.go
View File

@ -32,6 +32,7 @@ import (
"github.com/ProtonMail/go-proton-api"
"github.com/ProtonMail/proton-bridge/v3/internal"
"github.com/ProtonMail/proton-bridge/v3/internal/events"
"github.com/ProtonMail/proton-bridge/v3/internal/network"
"github.com/ProtonMail/proton-bridge/v3/internal/services/orderedtasks"
"github.com/bradenaw/juniper/xmaps"
"github.com/sirupsen/logrus"
@ -169,7 +170,11 @@ func (s *Service) Start(ctx context.Context, group *orderedtasks.OrderedCancelGr
if lastEventID == "" {
s.log.Debugf("No event ID present in storage, retrieving latest")
eventID, err := s.eventSource.GetLatestEventID(ctx)
client := network.NewClientRetryWrapper(s.eventSource, &network.ExpCoolDown{})
eventID, err := network.RetryWithClient(ctx, client, func(ctx context.Context, eventSource EventSource) (string, error) {
return eventSource.GetLatestEventID(ctx)
})
if err != nil {
return fmt.Errorf("failed to get latest event id: %w", err)
}
@ -194,6 +199,8 @@ func (s *Service) run(ctx context.Context, lastEventID string) {
defer s.log.Info("Exiting service")
defer s.Close()
client := network.NewClientRetryWrapper(s.eventSource, &network.ExpCoolDown{})
for {
select {
case <-ctx.Done():
@ -221,7 +228,11 @@ func (s *Service) run(ctx context.Context, lastEventID string) {
s.pendingSubscriptions = nil
}()
newEvents, _, err := s.eventSource.GetEvent(ctx, lastEventID)
newEvents, err := network.RetryWithClient(ctx, client, func(ctx context.Context, eventSource EventSource) ([]proton.Event, error) {
newEvents, _, err := eventSource.GetEvent(ctx, lastEventID)
return newEvents, err
})
if err != nil {
s.log.WithError(err).Errorf("Failed to get event (caused by %T)", internal.ErrCause(err))
continue