Skip to content

Commit

Permalink
Merge 6e52a0b into 10e7ce8
Browse files Browse the repository at this point in the history
  • Loading branch information
letzya committed Jul 26, 2018
2 parents 10e7ce8 + 6e52a0b commit 924aacb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion api_definition.go
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ func (a APIDefinitionLoader) compileCircuitBreakerPathSpec(paths []apidef.Circui
for e := range events {
switch e {
case circuit.BreakerTripped:
log.Warning("[PROXY] [CIRCUIT BREKER] Breaker tripped for path: ", path)
log.Warning("[PROXY] [CIRCUIT BREAKER] Breaker tripped for path: ", path)
log.Debug("Breaker tripped: ", e)
// Start a timer function

Expand Down
2 changes: 1 addition & 1 deletion reverse_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ func (p *ReverseProxy) WrappedServeHTTP(rw http.ResponseWriter, req *http.Reques
if breakerEnforced {
log.Debug("ON REQUEST: Breaker status: ", breakerConf.CB.Ready())
if !breakerConf.CB.Ready() {
p.ErrorHandler.HandleError(rw, logreq, "Service temporarily unnavailable.", 503)
p.ErrorHandler.HandleError(rw, logreq, "Service temporarily unavailable.", 503)
return nil
}
res, err = p.TykAPISpec.HTTPTransport.RoundTrip(outreq)
Expand Down

0 comments on commit 924aacb

Please sign in to comment.