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

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

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)
}