From 637e46117ddc05526688005911252723ad12229b Mon Sep 17 00:00:00 2001
From: Joe Zou <yixian.zou@gmail.com>
Date: Tue, 22 Sep 2020 11:42:32 +0800
Subject: [PATCH] Merge pull request #746 from
watermelo/Fix/rename_health_checher
Fix: rename SethealthChecker to SetHealthChecker
---
cluster/router/healthcheck/default_health_check.go | 4 ++--
common/extension/health_checker.go | 4 ++--
common/extension/health_checker_test.go | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/cluster/router/healthcheck/default_health_check.go b/cluster/router/healthcheck/default_health_check.go
index c693b86ec..c522bdf0f 100644
--- a/cluster/router/healthcheck/default_health_check.go
+++ b/cluster/router/healthcheck/default_health_check.go
@@ -31,7 +31,7 @@ import (
)
func init() {
- extension.SethealthChecker(constant.DEFAULT_HEALTH_CHECKER, NewDefaultHealthChecker)
+ extension.SetHealthChecker(constant.DEFAULT_HEALTH_CHECKER, NewDefaultHealthChecker)
}
// DefaultHealthChecker is the default implementation of HealthChecker, which determines the health status of
@@ -85,7 +85,7 @@ func (c *DefaultHealthChecker) getCircuitBreakerSleepWindowTime(status *protocol
} else if diff > constant.DEFAULT_SUCCESSIVE_FAILED_REQUEST_MAX_DIFF {
diff = constant.DEFAULT_SUCCESSIVE_FAILED_REQUEST_MAX_DIFF
}
- sleepWindow := (1 << diff) * c.GetCircuitTrippedTimeoutFactor()
+ sleepWindow := (1 << uint(diff)) * c.GetCircuitTrippedTimeoutFactor()
if sleepWindow > constant.MAX_CIRCUIT_TRIPPED_TIMEOUT_IN_MS {
sleepWindow = constant.MAX_CIRCUIT_TRIPPED_TIMEOUT_IN_MS
}
diff --git a/common/extension/health_checker.go b/common/extension/health_checker.go
index 8def72761..cec4c2def 100644
--- a/common/extension/health_checker.go
+++ b/common/extension/health_checker.go
@@ -26,8 +26,8 @@ var (
healthCheckers = make(map[string]func(url *common.URL) router.HealthChecker)
)
-// SethealthChecker sets the HealthChecker with @name
-func SethealthChecker(name string, fcn func(_ *common.URL) router.HealthChecker) {
+// SetHealthChecker sets the HealthChecker with @name
+func SetHealthChecker(name string, fcn func(_ *common.URL) router.HealthChecker) {
healthCheckers[name] = fcn
}
diff --git a/common/extension/health_checker_test.go b/common/extension/health_checker_test.go
index 4e83a6f6e..af6b114a6 100644
--- a/common/extension/health_checker_test.go
+++ b/common/extension/health_checker_test.go
@@ -32,7 +32,7 @@ import (
)
func TestGetHealthChecker(t *testing.T) {
- SethealthChecker("mock", newMockhealthCheck)
+ SetHealthChecker("mock", newMockHealthCheck)
checker := GetHealthChecker("mock", common.NewURLWithOptions())
assert.NotNil(t, checker)
}
@@ -44,6 +44,6 @@ func (m mockHealthChecker) IsHealthy(invoker protocol.Invoker) bool {
return true
}
-func newMockhealthCheck(_ *common.URL) router.HealthChecker {
+func newMockHealthCheck(_ *common.URL) router.HealthChecker {
return &mockHealthChecker{}
}
--
GitLab