foomo/keel
1
0
Fork 0
mirror of https://github.com/foomo/keel.git synced 2025-10-16 12:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #155 from foomo/fix/circuit-breaker-nil-pointer-exception

Browse Source 
fix: circuit breaker nil pointer exception
This commit is contained in:
Kevin Franklin Kim 2023-01-24 15:23:51 +01:00 committed by GitHub
commit 8e7d0a227e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/http/roundtripware/circuitbreaker.go
View File

@ -126,10 +126,15 @@ func CircuitBreaker(set *CircuitBreakerSettings, opts ...CircuitBreakerOption) R
return func(l *zap.Logger, next Handler) Handler { return func(l *zap.Logger, next Handler) Handler {
return func(r *http.Request) (*http.Response, error) { return func(r *http.Request) (*http.Response, error) {
if r == nil {
return nil, errors.New("request is nil")
}
// we need to detect the state change by ourselves, because the context does not allow us to hand in a context // we need to detect the state change by ourselves, because the context does not allow us to hand in a context
fromState := circuitBreaker.State() fromState := circuitBreaker.State()
// clone the request and the body if wanted // clone the request and the body if wanted
var errCopy error
reqCopy, errCopy := copyRequest(r, o.CopyReqBody) reqCopy, errCopy := copyRequest(r, o.CopyReqBody)
if errCopy != nil { if errCopy != nil {
l.Error("unable to copy request", log.FError(errCopy)) l.Error("unable to copy request", log.FError(errCopy))
@ -142,6 +147,9 @@ func CircuitBreaker(set *CircuitBreakerSettings, opts ...CircuitBreakerOption) R
// call the next handler enclosed in the circuit breaker. // call the next handler enclosed in the circuit breaker.
resp, err := circuitBreaker.Execute(func() (interface{}, error) { resp, err := circuitBreaker.Execute(func() (interface{}, error) {
resp, err := next(r) resp, err := next(r)
if resp == nil {
return nil, o.IsSuccessful(err, reqCopy, nil)
}
// clone the response and the body if wanted // clone the response and the body if wanted
respCopy, errCopy := copyResponse(resp, o.CopyRespBody) respCopy, errCopy := copyResponse(resp, o.CopyRespBody)