@@ -19,9 +19,10 @@ import (
1919 "reflect"
2020 "sync"
2121
22+ "github.com/pkg/errors"
23+
2224 "github.com/alibaba/sentinel-golang/logging"
2325 "github.com/alibaba/sentinel-golang/util"
24- "github.com/pkg/errors"
2526)
2627
2728type CircuitBreakerGenFunc func (r * Rule , reuseStat interface {}) (CircuitBreaker , error )
@@ -262,7 +263,7 @@ func onRuleUpdate(rawResRulesMap map[string][]*Rule) (err error) {
262263
263264 newBreakers := make (map [string ][]CircuitBreaker , len (validResRulesMap ))
264265 for res , resRules := range validResRulesMap {
265- newCbsOfRes := buildResourceCircuitBreaker (res , resRules , breakersClone [res ])
266+ newCbsOfRes := BuildResourceCircuitBreaker (res , resRules , breakersClone [res ])
266267 if len (newCbsOfRes ) > 0 {
267268 newBreakers [res ] = newCbsOfRes
268269 }
@@ -275,7 +276,7 @@ func onRuleUpdate(rawResRulesMap map[string][]*Rule) (err error) {
275276 currentRules = rawResRulesMap
276277
277278 logging .Debug ("[CircuitBreaker onRuleUpdate] Time statistics(ns) for updating circuit breaker rule" , "timeCost" , util .CurrentTimeNano ()- start )
278- logRuleUpdate (validResRulesMap )
279+ LogRuleUpdate (validResRulesMap )
279280 return nil
280281}
281282
@@ -305,7 +306,7 @@ func onResourceRuleUpdate(res string, rawResRules []*Rule) (err error) {
305306 oldResCbs = append (oldResCbs , breakers [res ]... )
306307 updateMux .RUnlock ()
307308
308- newCbsOfRes := buildResourceCircuitBreaker (res , rawResRules , oldResCbs )
309+ newCbsOfRes := BuildResourceCircuitBreaker (res , rawResRules , oldResCbs )
309310
310311 updateMux .Lock ()
311312 if len (newCbsOfRes ) == 0 {
@@ -341,7 +342,7 @@ func rulesFrom(rm map[string][]*Rule) []*Rule {
341342 return rules
342343}
343344
344- func logRuleUpdate (m map [string ][]* Rule ) {
345+ func LogRuleUpdate (m map [string ][]* Rule ) {
345346 rs := rulesFrom (m )
346347 if len (rs ) == 0 {
347348 logging .Info ("[CircuitBreakerRuleManager] Circuit breaking rules were cleared" )
@@ -399,12 +400,12 @@ func ClearRulesOfResource(res string) error {
399400 return err
400401}
401402
402- // buildResourceCircuitBreaker builds CircuitBreaker slice from rules. the resource of rules must be equals to res
403- func buildResourceCircuitBreaker (res string , rulesOfRes []* Rule , oldResCbs []CircuitBreaker ) []CircuitBreaker {
403+ // BuildResourceCircuitBreaker builds CircuitBreaker slice from rules. the resource of rules must be equals to res
404+ func BuildResourceCircuitBreaker (res string , rulesOfRes []* Rule , oldResCbs []CircuitBreaker ) []CircuitBreaker {
404405 newCbsOfRes := make ([]CircuitBreaker , 0 , len (rulesOfRes ))
405406 for _ , r := range rulesOfRes {
406407 if res != r .Resource {
407- logging .Error (errors .Errorf ("unmatched resource name expect: %s, actual: %s" , res , r .Resource ), "Unmatched resource name in circuitBreaker.buildResourceCircuitBreaker ()" , "rule" , r )
408+ logging .Error (errors .Errorf ("unmatched resource name expect: %s, actual: %s" , res , r .Resource ), "Unmatched resource name in circuitBreaker.BuildResourceCircuitBreaker ()" , "rule" , r )
408409 continue
409410 }
410411 equalIdx , reuseStatIdx := calculateReuseIndexFor (r , oldResCbs )
@@ -421,7 +422,7 @@ func buildResourceCircuitBreaker(res string, rulesOfRes []*Rule, oldResCbs []Cir
421422
422423 generator := cbGenFuncMap [r .Strategy ]
423424 if generator == nil {
424- logging .Warn ("[CircuitBreaker buildResourceCircuitBreaker ] Ignoring the rule due to unsupported circuit breaking strategy" , "rule" , r )
425+ logging .Warn ("[CircuitBreaker BuildResourceCircuitBreaker ] Ignoring the rule due to unsupported circuit breaking strategy" , "rule" , r )
425426 continue
426427 }
427428
@@ -433,7 +434,7 @@ func buildResourceCircuitBreaker(res string, rulesOfRes []*Rule, oldResCbs []Cir
433434 cb , e = generator (r , nil )
434435 }
435436 if cb == nil || e != nil {
436- logging .Warn ("[CircuitBreaker buildResourceCircuitBreaker ] Ignoring the rule due to bad generated circuit breaker" , "rule" , r , "err" , e .Error ())
437+ logging .Warn ("[CircuitBreaker BuildResourceCircuitBreaker ] Ignoring the rule due to bad generated circuit breaker" , "rule" , r , "err" , e .Error ())
437438 continue
438439 }
439440
0 commit comments