lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-26 08:21:28 +00:00
Code Issues Releases Activity

Merge pull request #693 from fuxiaohei/develop

Browse Source 
code style simplify
This commit is contained in:
astaxie 2014-07-12 19:33:32 +08:00
commit f657509a42
2 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
cache/redis/redis.go vendored
View File

@ -7,7 +7,7 @@
// @license http://github.com/astaxie/beego/blob/master/LICENSE // @license http://github.com/astaxie/beego/blob/master/LICENSE
// //
// @authors astaxie // @authors astaxie
package cache package redis
import ( import (
"encoding/json" "encoding/json"
@ -46,23 +46,21 @@ func (rc *RedisCache) do(commandName string, args ...interface{}) (reply interfa
// Get cache from redis. // Get cache from redis.
func (rc *RedisCache) Get(key string) interface{} { func (rc *RedisCache) Get(key string) interface{} {
v, err := rc.do("GET", key) if v, err := rc.do("GET", key); err == nil {
if err != nil {
return nil
}
return v return v
}
return nil
} }
// put cache to redis. // put cache to redis.
func (rc *RedisCache) Put(key string, val interface{}, timeout int64) error { func (rc *RedisCache) Put(key string, val interface{}, timeout int64) error {
_, err := rc.do("SET", key, val) var err error
if err != nil { if _, err = rc.do("SET", key, val); err != nil {
return nil return err
} }
_, err = rc.do("HSET", rc.key, key, true)
if err != nil { if _, err = rc.do("HSET", rc.key, key, true); err != nil {
return nil return err
} }
_, err = rc.do("EXPIRE", key, timeout) _, err = rc.do("EXPIRE", key, timeout)
return err return err
@ -70,9 +68,9 @@ func (rc *RedisCache) Put(key string, val interface{}, timeout int64) error {
// delete cache in redis. // delete cache in redis.
func (rc *RedisCache) Delete(key string) error { func (rc *RedisCache) Delete(key string) error {
_, err := rc.do("DEL", key) var err error
if err != nil { if _, err = rc.do("DEL", key); err != nil {
return nil return err
} }
_, err = rc.do("HDEL", rc.key, key) _, err = rc.do("HDEL", rc.key, key)
return err return err
@ -85,8 +83,7 @@ func (rc *RedisCache) IsExist(key string) bool {
return false return false
} }
if v == false { if v == false {
_, err := rc.do("HDEL", rc.key, key) if _, err = rc.do("HDEL", rc.key, key); err != nil {
if err != nil {
return false return false
} }
} }
@ -108,10 +105,12 @@ func (rc *RedisCache) Decr(key string) error {
// clean all cache in redis. delete this redis collection. // clean all cache in redis. delete this redis collection.
func (rc *RedisCache) ClearAll() error { func (rc *RedisCache) ClearAll() error {
cachedKeys, err := redis.Strings(rc.do("HKEYS", rc.key)) cachedKeys, err := redis.Strings(rc.do("HKEYS", rc.key))
for _, str := range cachedKeys {
_, err := rc.do("DEL", str)
if err != nil { if err != nil {
return nil return err
}
for _, str := range cachedKeys {
if _, err = rc.do("DEL", str); err != nil {
return err
} }
} }
_, err = rc.do("DEL", rc.key) _, err = rc.do("DEL", rc.key)
@ -140,26 +139,21 @@ func (rc *RedisCache) StartAndGC(config string) error {
c := rc.p.Get() c := rc.p.Get()
defer c.Close() defer c.Close()
if err := c.Err(); err != nil {
return err
}
return nil return c.Err()
} }
// connect to redis. // connect to redis.
func (rc *RedisCache) connectInit() { func (rc *RedisCache) connectInit() {
dialFunc := func() (c redis.Conn, err error) {
c, err = redis.Dial("tcp", rc.conninfo)
return
}
// initialize a new pool // initialize a new pool
rc.p = &redis.Pool{ rc.p = &redis.Pool{
MaxIdle: 3, MaxIdle: 3,
IdleTimeout: 180 * time.Second, IdleTimeout: 180 * time.Second,
Dial: func() (redis.Conn, error) { Dial: dialFunc,
c, err := redis.Dial("tcp", rc.conninfo)
if err != nil {
return nil, err
}
return c, nil
},
} }
} }

2
cache/redis/redis_test.go vendored
View File

@ -8,7 +8,7 @@
// @authors astaxie // @authors astaxie
package cache package redis
import ( import (
"testing" "testing"