Skip to content

Commit

Permalink
[fix] plugin/circuitbreaker/composite/rule.go (#206)
Browse files Browse the repository at this point in the history
- 修复sortCircuitBreakerRules函数中rule.RuleMatcher.Destination.Method在rule类型为SERVICE或INSTANCE时为nil的问题。

Co-authored-by: nil <jfa;efji2pij2fn3A;fj;q>
  • Loading branch information
yg66 authored Jun 4, 2024
1 parent d62971e commit 1480d15
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions plugin/circuitbreaker/composite/rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,18 +210,18 @@ func sortCircuitBreakerRules(rules []*fault_tolerance.CircuitBreakerRule) []*fau
// 1. compare destination service
destNamespace1 := rule1.RuleMatcher.Destination.Namespace
destService1 := rule1.RuleMatcher.Destination.Service
destMethod1 := rule1.RuleMatcher.Destination.Method.Value.Value

destNamespace2 := rule2.RuleMatcher.Destination.Namespace
destService2 := rule2.RuleMatcher.Destination.Service
destMethod2 := rule2.RuleMatcher.Destination.Method.Value.Value

svcResult := compareService(destNamespace1, destService1, destNamespace2, destService2)
if svcResult != 0 {
return svcResult < 0
}
if rule1.Level == rule2.Level {
if rule1.Level == fault_tolerance.Level_METHOD {
destMethod1 := rule1.RuleMatcher.Destination.Method.Value.Value
destMethod2 := rule2.RuleMatcher.Destination.Method.Value.Value
methodResult := compareStringValue(destMethod1, destMethod2)
if methodResult != 0 {
return methodResult < 0
Expand Down

0 comments on commit 1480d15

Please sign in to comment.