forked from Silverfish/proton-bridge
feat(GODT-2442): handle bad event resync resolution.
This commit is contained in:
@ -86,12 +86,22 @@ func (user *User) handleRefreshEvent(ctx context.Context, refresh proton.Refresh
|
||||
l.WithError(err).Error("Failed to report refresh to sentry")
|
||||
}
|
||||
|
||||
// Cancel the event stream once this refresh is done.
|
||||
defer user.pollAbort.Abort()
|
||||
return user.SyncEvent(ctx)
|
||||
}
|
||||
|
||||
// Resync after the refresh.
|
||||
func (user *User) SyncEvent(ctx context.Context) error {
|
||||
// Cancel the event stream
|
||||
user.pollAbort.Abort() // ??? There was a defer here. But I think it's best to do this immediately, there is no reason to continue with polls while having re-sync.
|
||||
|
||||
// Re-sync messages after the user, address and label refresh.
|
||||
defer user.goSync()
|
||||
|
||||
// stop IMAP and SMTP
|
||||
|
||||
if err := user.vault.SetEventID(""); err != nil {
|
||||
return fmt.Errorf("failed to clean latest event ID: %w", err)
|
||||
}
|
||||
|
||||
return safe.LockRet(func() error {
|
||||
// Fetch latest user info.
|
||||
apiUser, err := user.client.GetUser(ctx)
|
||||
|
||||
@ -626,6 +626,17 @@ func (user *User) doEventPoll(ctx context.Context) error {
|
||||
user.eventLock.Lock()
|
||||
defer user.eventLock.Unlock()
|
||||
|
||||
eventID := user.vault.EventID()
|
||||
if eventID == "" {
|
||||
err := errors.New("current eventID is empty")
|
||||
user.eventCh.Enqueue(events.UncategorizedEventError{ // this might be bad event.. I hope sync is ongoing
|
||||
UserID: user.ID(),
|
||||
Error: err,
|
||||
})
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
event, err := user.client.GetEvent(ctx, user.vault.EventID())
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get event (caused by %T): %w", internal.ErrCause(err), err)
|
||||
|
||||
Reference in New Issue
Block a user