修改redis分布式加锁的方式

Author: hero

redis/lock/lock.go

@@ -1,6 +1,7 @@
 package lock
 
 import (
+	"context"
 	"github.com/go-redis/redis"
 	"time"
 )
@@ -17,13 +18,12 @@ func NewRedisLock(conn *redis.Client, key, val string, timeout time.Duration) *R
 }
 
 //return true ===> Get the lock successfully
-func (lock *RedisLock) TryLock() (bool, error) {
-	//lock.conn.Do("SET",lock.key,lock.val,"EX",int(lock.timeout), "NX").Result()
-	return lock.conn.SetNX(lock.key, lock.val, lock.timeout).Result()
+func (lock *RedisLock) TryLock() error {
+	return lock.conn.Do(context.Background(), "set", lock.key, lock.val, "ex", int64(lock.timeout/time.Second), "nx").Err()
 }
 
 func (lock *RedisLock) UnLock() error {
-	return lock.conn.Del(lock.key).Err()
+	return lock.conn.Del(context.Background(), lock.key).Err()
 }
 
 func (lock *RedisLock) GetLockKey() string {

redis/lock/lock_server.go

@@ -1,7 +1,7 @@
 package lock
 
 type RedisLockServer interface {
-	TryLock() (bool, error)
+	TryLock() error
 	UnLock() error
 	GetLockKey() string
 	GetLockVal() string

redis/lock/lock_test.go

@@ -1,6 +1,7 @@
 package lock
 
 import (
+	"context"
 	"fmt"
 	"github.com/go-redis/redis"
 	"testing"
@@ -19,26 +20,24 @@ func TestRedis(t *testing.T) {
 			DB:           0,
 		},
 	)
-	err := GlobalClient.Ping().Err()
+	ping, err := GlobalClient.Ping(context.Background()).Result()
 	if nil != err {
 		panic(err)
 	}
-	redisLock := NewRedisLock(GlobalClient, "1", "2", time.Second*3)
+	fmt.Println("ping", ping)
+	redisLock := NewRedisLock(GlobalClient, "test", "1", time.Second*3)
 	InitRedis(redisLock)
 	select {}
 }
 func InitRedis(lock RedisLockServer) {
 	go func() {
 		for {
 			time.Sleep(time.Second)
-			succ, err := lock.TryLock()
+			err := lock.TryLock()
 			if err != nil {
-				panic(err)
-			}
-			if succ {
-				fmt.Println("获取锁成功")
-			} else {
 				fmt.Println("获取锁失败")
+			} else {
+				fmt.Println("获取锁成功")
 			}
 		}
 	}()