From 757b3613fe3f6d10b03da86b54acd85882131ed2 Mon Sep 17 00:00:00 2001 From: fatedier Date: Fri, 9 Aug 2019 12:47:27 +0800 Subject: [PATCH 1/2] fix health check bug, fix #1367 --- client/health/health.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client/health/health.go b/client/health/health.go index 42924a6427..91ea707b46 100644 --- a/client/health/health.go +++ b/client/health/health.go @@ -96,12 +96,12 @@ func (monitor *HealthCheckMonitor) Stop() { func (monitor *HealthCheckMonitor) checkWorker() { for { - ctx, cancel := context.WithDeadline(monitor.ctx, time.Now().Add(monitor.timeout)) - err := monitor.doCheck(ctx) + doCtx, cancel := context.WithDeadline(monitor.ctx, time.Now().Add(monitor.timeout)) + err := monitor.doCheck(doCtx) // check if this monitor has been closed select { - case <-ctx.Done(): + case <-monitor.ctx.Done(): cancel() return default: From b1838b1d5e3bf0c146883d68883067f36cff6048 Mon Sep 17 00:00:00 2001 From: fatedier Date: Fri, 9 Aug 2019 12:50:33 +0800 Subject: [PATCH 2/2] bump version to v0.28.2 --- utils/version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/version/version.go b/utils/version/version.go index cd24c6d861..a4cb6c0995 100644 --- a/utils/version/version.go +++ b/utils/version/version.go @@ -19,7 +19,7 @@ import ( "strings" ) -var version string = "0.28.1" +var version string = "0.28.2" func Full() string { return version