From 33e44fc9667d3359893b9e086ec46f73cf8ad9f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=AD=9F=E6=9F=B1?= <hmzzrcs@163.com>
Date: Tue, 17 Sep 2019 19:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4redis=20=E5=93=A8=E5=85=B5?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/redis-manager/factory.go | 16 +---------------
 common/redis-manager/proxy.go   | 18 +-----------------
 common/redis-manager/redis.go   |  3 +--
 3 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/common/redis-manager/factory.go b/common/redis-manager/factory.go
index 602b86a5..e14d59ca 100644
--- a/common/redis-manager/factory.go
+++ b/common/redis-manager/factory.go
@@ -2,7 +2,7 @@ package redis_manager
 
 import (
 	"fmt"
-	"github.com/eolinker/goku/common/redis"
+	"github.com/go-redis/redis"
 
 	"sort"
 )
@@ -29,21 +29,7 @@ func Create(config RedisConfig) Redis {
 				config:      config,
 			}
 		}
-	case RedisModeSentinel:
-		{
 
-			option := redis.SentinelRingOptions{
-				Addrs:    config.GetAddrs(),
-				Masters:  config.GetMasters(),
-				Password: config.GetPassword(),
-				DB:       config.GetDbIndex(),
-				PoolSize: _PoolSize,
-			}
-			return &redisProxy{
-				Cmdable: redis.NewSentinelRing(&option),
-				config:      config,
-			}
-		}
 	case RedisModeStand:
 		{
 
diff --git a/common/redis-manager/proxy.go b/common/redis-manager/proxy.go
index e1ee4905..60c2c28b 100644
--- a/common/redis-manager/proxy.go
+++ b/common/redis-manager/proxy.go
@@ -1,7 +1,7 @@
 package redis_manager
 
 import (
-	"github.com/eolinker/goku/common/redis"
+	"github.com/go-redis/redis"
 )
 
 type redisProxy struct {
@@ -27,18 +27,7 @@ func (p *redisProxy) Nodes() []string {
 			}(ch)
 
 		}
-	case RedisModeSentinel:
-		{
 
-			conn := p.Cmdable.(*redis.SentinelRing)
-			go func(ch chan string ) {
-				conn.ForEachAddr(func(addr string) error {
-					ch<-addr
-					return nil
-				})
-				close(ch)
-			}(ch)
-		}
 	case RedisModeStand:
 		{
 
@@ -68,12 +57,7 @@ func (p *redisProxy) Foreach(fn func(client *redis.Client) error) error {
 			conn := p.Cmdable.(*redis.ClusterClient)
 			return conn.ForEachMaster(fn)
 		}
-	case RedisModeSentinel:
-		{
 
-			conn := p.Cmdable.(*redis.SentinelRing)
-			return conn.ForEachShard(fn)
-		}
 	case RedisModeStand:
 		{
 
diff --git a/common/redis-manager/redis.go b/common/redis-manager/redis.go
index 00efcdba..680e0401 100644
--- a/common/redis-manager/redis.go
+++ b/common/redis-manager/redis.go
@@ -1,10 +1,9 @@
 package redis_manager
 
-import "github.com/eolinker/goku/common/redis"
+import "github.com/go-redis/redis"
 
 const (
 	RedisModeCluster  = "cluster"
-	RedisModeSentinel = "sentinel"
 	RedisModeStand    = "stand"
 )
 
-- 
GitLab