Merge pull request #1369 from fatedier/dev

bump version to v0.28.2
Merge pull request #1368 from fatedier/new
2019-08-09 12:59:13 +08:00 · 2019-08-09 12:52:46 +08:00 · 2019-08-09 12:50:33 +08:00 · 2019-08-09 12:47:27 +08:00
2 changed files with 4 additions and 4 deletions
--- 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:
--- 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
Author	SHA1	Message	Date
fatedier	134a46c00b	Merge pull request #1369 from fatedier/dev bump version to v0.28.2	2019-08-09 12:59:13 +08:00
fatedier	50796643fb	Merge pull request #1368 from fatedier/new fix health check bug, fix #1367	2019-08-09 12:52:46 +08:00
fatedier	b1838b1d5e	bump version to v0.28.2	2019-08-09 12:50:33 +08:00
fatedier	757b3613fe	fix health check bug, fix #1367	2019-08-09 12:47:27 +08:00