Commit 7eea511f authored by JiebinHu's avatar JiebinHu

兼容新旧redis

parent a37090f8
...@@ -9,6 +9,7 @@ import ( ...@@ -9,6 +9,7 @@ import (
) )
var RedisCluster *redis.Client var RedisCluster *redis.Client
var RedisClient *redis.Client
func init() { func init() {
RedisCluster = redis.NewClient(&redis.Options{ RedisCluster = redis.NewClient(&redis.Options{
...@@ -25,6 +26,21 @@ func init() { ...@@ -25,6 +26,21 @@ func init() {
} else { } else {
log.Println("redis db0 connection success - " + pong) log.Println("redis db0 connection success - " + pong)
} }
RedisClient = redis.NewClient(&redis.Options{
Addr: config.GetConfigRedis().REDIS_HOST,
Password: config.GetConfigRedis().REDIS_PASSWORD, // no password set
DB: 0, // use default DB
PoolSize: 200,
MinIdleConns: 20,
})
pong, err = RedisClient.Ping(context.Background()).Result()
if err != nil {
mylogrus.MyLog.Warn(err)
mylogrus.MyLog.Fatal("redis db0 connect fail")
} else {
log.Println("redis db0 connection success - " + pong)
}
// log hook // log hook
//RedisClient.AddHook(redisHook{}) //RedisClient.AddHook(redisHook{})
} }
...@@ -32,3 +48,7 @@ func init() { ...@@ -32,3 +48,7 @@ func init() {
func GetRedisCluster() *redis.Client { func GetRedisCluster() *redis.Client {
return RedisCluster return RedisCluster
} }
func GetRedisClient() *redis.Client {
return RedisClient
}
...@@ -28,6 +28,9 @@ func main() { ...@@ -28,6 +28,9 @@ func main() {
go func() { go func() {
deal() deal()
}() }()
go func() {
dealOld() // 临时处理
}()
} }
for i := 0; i < SEND_WORKER; i++ { for i := 0; i < SEND_WORKER; i++ {
go func() { go func() {
...@@ -89,6 +92,33 @@ func deal() { ...@@ -89,6 +92,33 @@ func deal() {
} }
} }
func dealOld() {
for true {
//不需要加锁,注意,阻塞。
strs, err := redisCli.GetRedisClient().BLPop(context.Background(), time.Second, micInfoChange).Result()
if err != nil {
if err != redis.Nil {
mylogrus.MyLog.Errorf("cron micChangeSys redisCli.GetRedis().BLPop err:+%v", err)
}
}
if len(strs) >= 2 {
content := strs[1]
//mylogrus.MyLog.Infof("cron micChangeSys content:%v", content)
micSystemMsg := MicSystemMsg{}
if err := json.Unmarshal([]byte(content), &micSystemMsg); err != nil {
mylogrus.MyLog.Errorf("cron micChangeSys Unmarshal err:%+v, content:%v", err, content)
}
sendChan <- GroupSystemMsg{
MsgGroupUid: micSystemMsg.GroupUid,
MsgId: micSystemMsg.MsgId,
Source: micSystemMsg.Source,
Target: micSystemMsg.Target,
Content: micSystemMsg.Content,
}
}
}
}
//var limiter = rate.NewLimiter(2000, 2000) //var limiter = rate.NewLimiter(2000, 2000)
func send() { func send() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment