recover possiblely close chan error

Author: wongoo

sync_test.go

@@ -126,7 +126,8 @@ func TestClient_SyncJSON_MapObject(t *testing.T) {
 	waitEventWatch()
 
 	assert.Equal(t, "wongoo", m["name"])
-	assert.Equal(t, float64(1), m["sex"])
+
+	assert.Equal(t, 1, int(m["sex"].(float64)))
 
 	w.Close()
 }
@@ -153,14 +154,15 @@ func TestClient_SyncJSONMap(t *testing.T) {
 
 	waitEventWatch()
 
-	err = testClient.SetMapJSONValue(path, "u1", &user{Name: "wongoo", Sex: 1})
+	sex := 1
+	err = testClient.SetMapJSONValue(path, "u1", &user{Name: "wongoo", Sex: sex})
 	assert.Nil(t, err)
 
 	waitEventWatch()
 
 	assert.Equal(t, 1, len(users))
 	assert.Equal(t, "wongoo", users["u1"].Name)
-	assert.Equal(t, 1, users["u1"].Sex)
+	assert.Equal(t, sex, users["u1"].Sex)
 
 	err = testClient.SetMapJSONValue(path, "u1", &user{Name: "yang", Sex: 0})
 	assert.Nil(t, err)

watcher.go

@@ -70,6 +70,10 @@ func (w *Watcher) Close() {
 	w.Lock()
 	defer w.Unlock()
 
+	defer func() {
+		_ = recover()
+	}()
+
 	select {
 	case <-w.done:
 	default:

zkclient.go

@@ -15,6 +15,10 @@ import (
 	"github.com/vogo/logger"
 )
 
+const (
+	connCheckInterval = time.Second * 20
+)
+
 // AlarmTrigger alarm function
 type AlarmTrigger func(err error)
 
@@ -61,7 +65,7 @@ func NewClient(servers []string, options ...ClientOption) *Client {
 // collectDeadWatchers start a goroutine to maintain the zk connection
 func (cli *Client) startConnMaintainer() {
 	go func() {
-		ticker := time.NewTicker(time.Second * 20)
+		ticker := time.NewTicker(connCheckInterval)
 
 		for {
 			select {

zkclient_test.go

@@ -54,6 +54,10 @@ func connectLocalZK(_ *testing.T) *Client {
 	return c
 }
 
+const (
+	watchWaitInterval = time.Second * 2
+)
+
 func waitEventWatch() {
-	time.Sleep(time.Second * 2)
+	time.Sleep(watchWaitInterval)
 }