yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

fix(GODT-2327): Don't retry with abortable context because it's canceled

Browse Source
This commit is contained in:
James Houlahan
2023-02-06 16:58:01 +01:00
committed by Jakub
parent 0a8e71771e
commit 9c6be78b4c
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/bridge/imap.go
View File

@ -140,7 +140,7 @@ func (bridge *Bridge) addIMAPUser(ctx context.Context, user *user.User) error {
if err := user.ClearSyncStatus(); err != nil { if err := user.ClearSyncStatus(); err != nil {
return fmt.Errorf("failed to clear sync status: %w", err) return fmt.Errorf("failed to clear sync status: %w", err)
} }
// Add the user back to the IMAP server. // Add the user back to the IMAP server.
if isNew, err := bridge.imapServer.LoadUser(ctx, imapConn, gluonID, user.GluonKey()); err != nil { if isNew, err := bridge.imapServer.LoadUser(ctx, imapConn, gluonID, user.GluonKey()); err != nil {
return fmt.Errorf("failed to add IMAP user: %w", err) return fmt.Errorf("failed to add IMAP user: %w", err)

10
internal/user/user.go
View File

@ -196,15 +196,7 @@ func New(
if err := user.doSync(ctx); err != nil { if err := user.doSync(ctx); err != nil {
user.log.WithError(err).Error("Failed to sync, will retry later") user.log.WithError(err).Error("Failed to sync, will retry later")
time.AfterFunc(SyncRetryCooldown, user.goSync)
go func() {
select {
case <-ctx.Done():
user.log.WithError(err).Warn("Aborting sync retry")
case <-time.After(SyncRetryCooldown):
user.goSync()
}
}()
} }
}) })