改为短连接，防止长连接长时间不用断开不可用

shiguanghuxian · Sep 29, 2019 · cb6c1f8 · cb6c1f8
1 parent 248ee23
commit cb6c1f8
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/program/etcdv3/etcdv3.go b/program/etcdv3/etcdv3.go
@@ -81,23 +81,37 @@ func NewEtcdCli(etcdCfg *config.EtcdServer) (*Etcd3Client, error) {
 	}, nil
 }
 
+// Close 关闭连接
+func (c *Etcd3Client) Close() error {
+	return c.Client.Close()
+}
+
 // GetEtcdCli 获取一个etcd cli对象
 func GetEtcdCli(etcdCfg *config.EtcdServer) (*Etcd3Client, error) {
 	if etcdCfg == nil {
 		return nil, errors.New("etcdCfg is nil")
 	}
-	val, ok := etcdClis.Load(etcdCfg.Name)
-	if ok == false {
-		if len(etcdCfg.Address) > 0 {
-			cli, err := NewEtcdCli(etcdCfg)
-			if err != nil {
-				return nil, err
-			}
-			return cli, nil
+	if len(etcdCfg.Address) > 0 {
+		cli, err := NewEtcdCli(etcdCfg)
+		if err != nil {
+			return nil, err
 		}
-		return nil, errors.New("Getting etcd client error")
+		return cli, nil
 	}
-	return &Etcd3Client{
-		Client: val.(*clientv3.Client),
-	}, nil
+	return nil, errors.New("Getting etcd client error")
+
+	// val, ok := etcdClis.Load(etcdCfg.Name)
+	// if ok == false {
+	// 	if len(etcdCfg.Address) > 0 {
+	// 		cli, err := NewEtcdCli(etcdCfg)
+	// 		if err != nil {
+	// 			return nil, err
+	// 		}
+	// 		return cli, nil
+	// 	}
+	// 	return nil, errors.New("Getting etcd client error")
+	// }
+	// return &Etcd3Client{
+	// 	Client: val.(*clientv3.Client),
+	// }, nil
 }
diff --git a/program/http.go b/program/http.go
@@ -12,7 +12,7 @@ import (
 	"github.com/shiguanghuxian/etcd-manage/program/config"
 	"github.com/shiguanghuxian/etcd-manage/program/etcdv3"
 	"github.com/shiguanghuxian/etcd-manage/program/logger"
-	"github.com/shiguanghuxian/etcd-manage/program/v1"
+	v1 "github.com/shiguanghuxian/etcd-manage/program/v1"
 )
 
 // http 服务
@@ -130,6 +130,12 @@ func (p *Program) middlewareEtcd() gin.HandlerFunc {
 
 		c.Next()
 
+		etcdCli, exists := c.Get("EtcdServer")
+		if exists == true {
+			if cli, ok := etcdCli.(*etcdv3.Etcd3Client); ok == true {
+				cli.Close()
+			}
+		}
 	}
 }