redis trylock

@@ -2,78 +2,104 @@ package redis
 
 import (
 	"fmt"
-	"github.com/astaxie/beego"
 	"github.com/gomodule/redigo/redis"
+	"gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
 	"sync"
+	"time"
 )
 
 type Mutex struct {
-	conn redis.Conn
-	timeOut int64
-	resource string
-	lock bool
+	conn      redis.Conn
+	timeOut   int64
+	resource  string
+	lock      bool
 	closeOnce sync.Once
 }
+
 //NewMutex  create new mutex
-func NewMutex(source string)*Mutex{
+func NewMutex(source string) *Mutex {
 	return &Mutex{
-		resource:source,
-		lock:false,
-		timeOut:SECOND*5,//未执行完,已经超时 超时时间设大
+		resource: source,
+		lock:     false,
+		timeOut:  SECOND * 5, //未执行完,已经超时 超时时间设大
 	}
 }
-func (l *Mutex)Key()string{
-	return fmt.Sprintf("reidslock:%s",l.resource)
+func (l *Mutex) Key() string {
+	return fmt.Sprintf("reidslock:%s", l.resource)
 }
-func(l *Mutex)Conn()redis.Conn{
+func (l *Mutex) Conn() redis.Conn {
 	return l.conn
 }
+
 //设置超时
-func (l *Mutex)TimeOut(t int64)*Mutex{
+func (l *Mutex) TimeOut(t int64) *Mutex {
 	l.timeOut = t
 	return l
 }
+
 //加锁
 //true:加锁成功  false:加锁失败
-func (l *Mutex)Lock()( bool){
-	defer func(){
-		if !l.lock{
-			beego.Warn("on locked:",l.Key())
+func (l *Mutex) Lock() bool {
+	defer func() {
+		if !l.lock {
+			log.Warn("on locked:", l.Key())
 			l.Close()
 		}
 	}()
-	if l.lock{
+	if l.lock {
 		return l.lock
 	}
-	l.conn =redisPool.Get()
-	resourceKey :=l.Key()
-	if result, err := l.conn.Do("SET", resourceKey,l.resource,"NX","EX", l.timeOut); err != nil || result==nil{
+	l.conn = redisPool.Get()
+	resourceKey := l.Key()
+	if result, err := l.conn.Do("SET", resourceKey, l.resource, "NX", "EX", l.timeOut); err != nil || result == nil {
 		return l.lock
-	}else{
-		ok :=result.(string)
-		if ok !="OK"{
+	} else {
+		ok := result.(string)
+		if ok != "OK" {
 			return l.lock
 		}
 	}
 	l.lock = true
 	return l.lock
 }
+
+//try get lock util time out
+func (l *Mutex) TryLock(timeOut int) bool {
+	log.Info("try lock:", l.Key())
+	now := time.Now().Unix() + int64(timeOut)
+	count := 1
+	for {
+		if now < time.Now().Unix() {
+			log.Info(fmt.Sprintf("try lock timeout:%v  retry %v; end...", l.Key(), count))
+			return false
+		}
+		result := l.Lock()
+		if result {
+			return true
+		}
+		log.Info(fmt.Sprintf("try lock fail:%v ... retry %v", l.Key(), count))
+		count++
+		time.Sleep(time.Second * 1)
+	}
+}
+
 //解锁
-func(l *Mutex)UnLock()error{
+func (l *Mutex) UnLock() error {
 	defer l.Close()
-	if !l.lock{
+	if !l.lock {
 		return nil
 	}
-	if _,err :=l.conn.Do("DEL",l.Key());err!=nil{
+	if _, err := l.conn.Do("DEL", l.Key()); err != nil {
 		return err
 	}
 	l.lock = false
 	return nil
 }
+
 //关闭
-func(l *Mutex)Close(){
-	l.closeOnce.Do(func(){
-		if l.conn!=nil{
+func (l *Mutex) Close() {
+	l.closeOnce.Do(func() {
+		if l.conn != nil {
 			l.conn.Close()
 		}
 	})

@@ -57,6 +57,17 @@ func Init(conf config.Redis) error {
 	return err
 }
 
+func NewClient() redis.Conn {
+	c := redisPool.Get()
+	return c
+}
+
+func NewPubsubClient() redis.PubSubConn {
+	c := redisPool.Get()
+	psc := redis.PubSubConn{c}
+	return psc
+}
+
 func ping() (bool, error) {
 	c := redisPool.Get()
 	defer c.Close()