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

fix(GODT-2412): Don't treat context cancellation as BadEvent

Browse Source
This commit is contained in:
James Houlahan
2023-02-27 13:00:32 +01:00
parent 810705ba01
commit 761c16d8cd
3 changed files with 41 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
internal/bridge/user_events.go
View File

@ -19,10 +19,10 @@ package bridge
import (
"context"
"errors"
"fmt"
"github.com/ProtonMail/gluon/reporter"
"github.com/ProtonMail/proton-bridge/v3/internal"
"github.com/ProtonMail/proton-bridge/v3/internal/events"
"github.com/ProtonMail/proton-bridge/v3/internal/safe"
"github.com/ProtonMail/proton-bridge/v3/internal/user"
@ -177,7 +177,7 @@ func (bridge *Bridge) handleUserDeauth(ctx context.Context, user *user.User) {
func (bridge *Bridge) handleUserBadEvent(ctx context.Context, user *user.User, err error) {
safe.Lock(func() {
if rerr := bridge.reporter.ReportMessageWithContext("Failed to handle event", reporter.Context{
"error_type": fmt.Sprintf("%T", getUnwrappedError(err)),
"error_type": fmt.Sprintf("%T", internal.ErrCause(err)),
"error": err,
}); rerr != nil {
logrus.WithError(rerr).Error("Failed to report failed event handling")
@ -189,22 +189,9 @@ func (bridge *Bridge) handleUserBadEvent(ctx context.Context, user *user.User, e
func (bridge *Bridge) handleUncategorizedErrorEvent(event events.UncategorizedEventError) {
if rerr := bridge.reporter.ReportMessageWithContext("Failed to handle due to uncategorized error", reporter.Context{
"error_type": fmt.Sprintf("%T", getUnwrappedError(event.Error)),
"error_type": fmt.Sprintf("%T", internal.ErrCause(event.Error)),
"error": event.Error,
}); rerr != nil {
logrus.WithError(rerr).Error("Failed to report failed event handling")
}
}
func getUnwrappedError(err error) error {
for {
unwrapped := errors.Unwrap(err)
if unwrapped == nil {
break
}
err = unwrapped
}
return err
}