From 0ceded34052bb53d1084fa8e2336c1a37eb6587c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E4=B8=AB=E8=AE=B2=E6=A2=B5?= <eryajf@163.com>
Date: Fri, 9 Aug 2024 12:20:15 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=8D=BB=20=E5=A2=9E=E5=8A=A0zk?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6timeout=E9=85=8D=E7=BD=AE=E9=A1=B9=E7=9A=84?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=20(#1023)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: 🍻 增加zk插件timeout配置项的默认值

* fix: 去掉自动增加的空格
---
 inputs/zookeeper/zookeeper.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/inputs/zookeeper/zookeeper.go b/inputs/zookeeper/zookeeper.go
index cefa529b..fec38992 100644
--- a/inputs/zookeeper/zookeeper.go
+++ b/inputs/zookeeper/zookeeper.go
@@ -3,7 +3,7 @@ package zookeeper
 import (
 	crypto_tls "crypto/tls"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net"
 	"regexp"
@@ -91,6 +91,10 @@ func (ins *Instance) Init() error {
 	if len(ins.ZkHosts()) == 0 {
 		return types.ErrInstancesEmpty
 	}
+	// set default timeout
+	if ins.Timeout == 0 {
+		ins.Timeout = 10
+	}
 	return nil
 }
 
@@ -242,7 +246,7 @@ func sendZookeeperCmd(conn net.Conn, cmd string) string {
 		return ""
 	}
 
-	res, err := ioutil.ReadAll(conn)
+	res, err := io.ReadAll(conn)
 	if err != nil {
 		log.Printf("E! failed read Zookeeper command: '%s' response from '%s': %s", cmd, conn.RemoteAddr().String(), err)
 		return ""