Merge pull request #23 from savitaashture/circuiteChanges

tianxiaoliang · web-flow · commit 7865e9ff7b6a · 2018-06-07T09:11:54.000+08:00
Added changes to take the circuite status from hystrix
diff --git a/monitorData.go b/monitorData.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/ServiceComb/go-chassis/core/lager"
+	"github.com/ServiceComb/go-chassis/third_party/forked/afex/hystrix-go/hystrix"
 	"github.com/rcrowley/go-metrics"
 )
 
@@ -91,8 +92,11 @@ func (monitorData *MonitorData) appendInterfaceInfo(name string, i interface{})
 			interfaceInfo.successCount = metric.Count()
 		}
 
-		if interfaceInfo.ShortCircuited != 0 {
+		cb, _, _ := hystrix.GetCircuit(getInterfaceName(name))
+		if cb.IsOpen() {
 			interfaceInfo.IsCircuitBreakerOpen = true
+		} else {
+			interfaceInfo.IsCircuitBreakerOpen = false
 		}
 
 		qps := (float64(interfaceInfo.Total) * (1 - math.Exp(-5.0/60.0/1)))

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import (`
`10`	`10`	`"time"`
`11`	`11`
`12`	`12`	`"github.com/ServiceComb/go-chassis/core/lager"`
	`13`	`+ "github.com/ServiceComb/go-chassis/third_party/forked/afex/hystrix-go/hystrix"`
`13`	`14`	`"github.com/rcrowley/go-metrics"`
`14`	`15`	`)`
`15`	`16`
`@@ -91,8 +92,11 @@ func (monitorData *MonitorData) appendInterfaceInfo(name string, i interface{})`
`91`	`92`	`interfaceInfo.successCount = metric.Count()`
`92`	`93`	`}`
`93`	`94`
`94`		`- if interfaceInfo.ShortCircuited != 0 {`
	`95`	`+ cb, _, _ := hystrix.GetCircuit(getInterfaceName(name))`
	`96`	`+ if cb.IsOpen() {`
`95`	`97`	`interfaceInfo.IsCircuitBreakerOpen = true`
	`98`	`+ } else {`
	`99`	`+ interfaceInfo.IsCircuitBreakerOpen = false`
`96`	`100`	`}`
`97`	`101`
`98`	`102`	`qps := (float64(interfaceInfo.Total) * (1 - math.Exp(-5.0/60.0/1)))`