lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 13:00:54 +00:00
Code Issues Releases Activity

fix #233

Browse Source 
thanks for the good suggestion
This commit is contained in:
astaxie 2013-09-30 11:30:22 +08:00
parent 35a136bcee
commit bf836a2126
2 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cache/cache.go vendored
View File

@ -36,6 +36,9 @@ func NewCache(adapterName, config string) (Cache, error) {
if !ok { if !ok {
return nil, fmt.Errorf("cache: unknown adaptername %q (forgotten import?)", adapterName) return nil, fmt.Errorf("cache: unknown adaptername %q (forgotten import?)", adapterName)
} }
adapter.StartAndGC(config) err := adapter.StartAndGC(config)
if err != nil {
return nil, err
}
return adapter, nil return adapter, nil
} }

54
cache/redis.go vendored
View File

@ -22,7 +22,11 @@ func NewRedisCache() *RedisCache {
func (rc *RedisCache) Get(key string) interface{} { func (rc *RedisCache) Get(key string) interface{} {
if rc.c == nil { if rc.c == nil {
rc.c = rc.connectInit() var err error
rc.c, err = rc.connectInit()
if err != nil {
return nil
}
} }
v, err := rc.c.Do("HGET", rc.key, key) v, err := rc.c.Do("HGET", rc.key, key)
if err != nil { if err != nil {
@ -33,7 +37,11 @@ func (rc *RedisCache) Get(key string) interface{} {
func (rc *RedisCache) Put(key string, val interface{}, timeout int64) error { func (rc *RedisCache) Put(key string, val interface{}, timeout int64) error {
if rc.c == nil { if rc.c == nil {
rc.c = rc.connectInit() var err error
rc.c, err = rc.connectInit()
if err != nil {
return err
}
} }
_, err := rc.c.Do("HSET", rc.key, key, val) _, err := rc.c.Do("HSET", rc.key, key, val)
return err return err
@ -41,7 +49,11 @@ func (rc *RedisCache) Put(key string, val interface{}, timeout int64) error {
func (rc *RedisCache) Delete(key string) error { func (rc *RedisCache) Delete(key string) error {
if rc.c == nil { if rc.c == nil {
rc.c = rc.connectInit() var err error
rc.c, err = rc.connectInit()
if err != nil {
return err
}
} }
_, err := rc.c.Do("HDEL", rc.key, key) _, err := rc.c.Do("HDEL", rc.key, key)
return err return err
@ -49,7 +61,11 @@ func (rc *RedisCache) Delete(key string) error {
func (rc *RedisCache) IsExist(key string) bool { func (rc *RedisCache) IsExist(key string) bool {
if rc.c == nil { if rc.c == nil {
rc.c = rc.connectInit() var err error
rc.c, err = rc.connectInit()
if err != nil {
return false
}
} }
v, err := redis.Bool(rc.c.Do("HEXISTS", rc.key, key)) v, err := redis.Bool(rc.c.Do("HEXISTS", rc.key, key))
if err != nil { if err != nil {
@ -60,7 +76,11 @@ func (rc *RedisCache) IsExist(key string) bool {
func (rc *RedisCache) Incr(key string) error { func (rc *RedisCache) Incr(key string) error {
if rc.c == nil { if rc.c == nil {
rc.c = rc.connectInit() var err error
rc.c, err = rc.connectInit()
if err != nil {
return err
}
} }
_, err := redis.Bool(rc.c.Do("HINCRBY", rc.key, key, 1)) _, err := redis.Bool(rc.c.Do("HINCRBY", rc.key, key, 1))
if err != nil { if err != nil {
@ -71,7 +91,11 @@ func (rc *RedisCache) Incr(key string) error {
func (rc *RedisCache) Decr(key string) error { func (rc *RedisCache) Decr(key string) error {
if rc.c == nil { if rc.c == nil {
rc.c = rc.connectInit() var err error
rc.c, err = rc.connectInit()
if err != nil {
return err
}
} }
_, err := redis.Bool(rc.c.Do("HINCRBY", rc.key, key, -1)) _, err := redis.Bool(rc.c.Do("HINCRBY", rc.key, key, -1))
if err != nil { if err != nil {
@ -82,7 +106,11 @@ func (rc *RedisCache) Decr(key string) error {
func (rc *RedisCache) ClearAll() error { func (rc *RedisCache) ClearAll() error {
if rc.c == nil { if rc.c == nil {
rc.c = rc.connectInit() var err error
rc.c, err = rc.connectInit()
if err != nil {
return err
}
} }
_, err := rc.c.Do("DEL", rc.key) _, err := rc.c.Do("DEL", rc.key)
return err return err
@ -99,19 +127,23 @@ func (rc *RedisCache) StartAndGC(config string) error {
} }
rc.key = cf["key"] rc.key = cf["key"]
rc.conninfo = cf["conn"] rc.conninfo = cf["conn"]
rc.c = rc.connectInit() var err error
rc.c, err = rc.connectInit()
if err != nil {
return err
}
if rc.c == nil { if rc.c == nil {
return errors.New("dial tcp conn error") return errors.New("dial tcp conn error")
} }
return nil return nil
} }
func (rc *RedisCache) connectInit() redis.Conn { func (rc *RedisCache) connectInit() (redis.Conn, error) {
c, err := redis.Dial("tcp", rc.conninfo) c, err := redis.Dial("tcp", rc.conninfo)
if err != nil { if err != nil {
return nil return nil, err
} }
return c return c, nil
} }
func init() { func init() {