Skip to content

Commit

Permalink
fix(chore): Wrong panic in singleflight (#436)
Browse files Browse the repository at this point in the history
* fix(chore): Wrong panic in singleflight

* fix(chore): Return http.ErrAbortHandler direct instead of Unwrapping it

---------

Co-authored-by: Vincent Jordan <vincent.jordan@platform.sh>
  • Loading branch information
vejipe and Vincent Jordan committed Jan 11, 2024
1 parent d7c2715 commit 4700b6d
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion pkg/middleware/middleware.go
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

0 comments on commit 4700b6d

Please sign in to comment.