Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-11 13:16:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(GODT-2390): Missing changes from pervious commit

Browse Source 
Always reports error type to sentry.

Add error checks for get event as well.
This commit is contained in:
Leander Beernaert
2023-02-24 12:45:13 +01:00
parent 3e878058e7
commit f8bfbaf361
2 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/bridge/user_events.go
View File

@ -19,6 +19,7 @@ package bridge
import (
"context"
"errors"
"fmt"
"github.com/ProtonMail/gluon/reporter"
@ -142,7 +143,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", err),
"error_type": fmt.Sprintf("%T", getUnwrappedError(err)),
"error": err,
}); rerr != nil {
logrus.WithError(rerr).Error("Failed to report failed event handling")
@ -154,9 +155,22 @@ 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", event.Error),
"error_type": fmt.Sprintf("%T", getUnwrappedError(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
}

27
internal/user/user.go
View File

@ -630,6 +630,33 @@ func (user *User) doEventPoll(ctx context.Context) error {
event, err := user.client.GetEvent(ctx, user.vault.EventID())
if err != nil {
if netErr := new(proton.NetError); errors.As(err, &netErr) {
return fmt.Errorf("failed to get event due to network issue: %w", err)
}
// Catch all for uncategorized net errors that may slip through.
if netErr := new(net.OpError); errors.As(err, &netErr) {
user.eventCh.Enqueue(events.UncategorizedEventError{
UserID: user.ID(),
Error: err,
})
return fmt.Errorf("failed to get event due to network issues (uncategorized): %w", err)
}
// In case a json decode error slips through.
if jsonErr := new(json.UnmarshalTypeError); errors.As(err, &jsonErr) {
user.eventCh.Enqueue(events.UncategorizedEventError{
UserID: user.ID(),
Error: err,
})
}
// If the error is a server-side issue, return error to retry later.
if apiErr := new(proton.APIError); errors.As(err, &apiErr) && apiErr.Status >= 500 {
return fmt.Errorf("failed to get event due to server error: %w", err)
}
return fmt.Errorf("failed to get event: %w", err)
}