Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(chore): Wrong panic in singleflight #436

Merged
merged 2 commits into from
Jan 11, 2024
Merged

fix(chore): Wrong panic in singleflight #436

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
628c234
fix(chore): Wrong panic in singleflight
Jan 9, 2024
0017279
fix(chore): Return http.ErrAbortHandler direct instead of Unwrapping it
Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion pkg/middleware/middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,19 @@ func (s *SouinBaseHandler) Upstream(
s.Configuration.GetLogger().Sugar().Debug("Request the upstream server")
prometheus.Increment(prometheus.RequestCounter)

var recoveredFromErr error = nil
defer func() {
// In case of "http.ErrAbortHandler" panic,
// prevent singleflight from wrapping it into "singleflight.panicError".
if r := recover(); r != nil {
err := r.(error)
if errors.Is(err, http.ErrAbortHandler) {
recoveredFromErr = http.ErrAbortHandler
} else {
panic(err)
}
}
}()
sfValue, err, shared := s.singleflightPool.Do(cachedKey, func() (interface{}, error) {
if e := next(customWriter, rq); e != nil {
s.Configuration.GetLogger().Sugar().Warnf("%#v", e)
Expand Down Expand Up @@ -345,7 +358,9 @@ func (s *SouinBaseHandler) Upstream(
code: statusCode,
}, err
})

if recoveredFromErr != nil {
panic(recoveredFromErr)
}
if err != nil {
return err
}
Expand Down
Loading