diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2019-10-24 19:23:48 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-10-25 13:28:42 +0200 |
| commit | ffff482138fcd5cf49ceae1d8c6bb41fa59af49a (patch) | |
| tree | 5da237663cf1e6b33dc9ebbf53c52c5c094683f9 | |
| parent | e1b158574ee515e4e81a6db7bb57e306e8cbdfa8 (diff) | |
dashboard/app: don't log user errors in checkCrashTextAccess too
This pollutes error logs too.
| -rw-r--r-- | dashboard/app/access.go | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/dashboard/app/access.go b/dashboard/app/access.go index a1ce6d934..41602fa69 100644 --- a/dashboard/app/access.go +++ b/dashboard/app/access.go @@ -108,8 +108,11 @@ func checkCrashTextAccess(c context.Context, r *http.Request, field string, id i return nil, fmt.Errorf("failed to query crashes: %v", err) } if len(crashes) != 1 { - return nil, fmt.Errorf("checkCrashTextAccess: found %v crashes for %v=%v", - len(crashes), field, id) + err := fmt.Errorf("checkCrashTextAccess: found %v crashes for %v=%v", len(crashes), field, id) + if len(crashes) == 0 { + err = ErrDontLog{err} + } + return nil, err } crash := crashes[0] bug := new(Bug) @@ -128,13 +131,13 @@ func checkJobTextAccess(c context.Context, r *http.Request, field string, id int if err != nil { return fmt.Errorf("failed to query jobs: %v", err) } - if len(keys) == 0 { - // This can be triggered by bad user requests, so don't log the error. - return ErrDontLog{fmt.Errorf("checkJobTextAccess: found no jobs for %v=%v", field, id)} - } - if len(keys) > 1 { - return fmt.Errorf("checkJobTextAccess: found %v jobs for %v=%v", - len(keys), field, id) + if len(keys) != 1 { + err := fmt.Errorf("checkJobTextAccess: found %v jobs for %v=%v", len(keys), field, id) + if len(keys) == 0 { + // This can be triggered by bad user requests, so don't log the error. + err = ErrDontLog{err} + } + return err } bug := new(Bug) if err := db.Get(c, keys[0].Parent(), bug); err != nil { |
