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

Merge pull request #56 from yecrane/master

Browse Source 
修改redis连接池，设置key，获取key的方式
This commit is contained in:
astaxie 2013-05-14 18:52:33 -07:00
commit 22510bc272
1 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
session/sess_redis.go
View File

@ -6,18 +6,24 @@ import (
var redispder = &RedisProvider{} var redispder = &RedisProvider{}
var MAX_POOL_SIZE = 20
var redisPool chan redis.Conn
type RedisSessionStore struct { type RedisSessionStore struct {
c redis.Conn c redis.Conn
sid string sid string
} }
func (rs *RedisSessionStore) Set(key, value interface{}) error { func (rs *RedisSessionStore) Set(key, value interface{}) error {
//_, err := rs.c.Do("HSET", rs.sid, key, value)
_, err := rs.c.Do("HSET", rs.sid, key, value) _, err := rs.c.Do("HSET", rs.sid, key, value)
return err return err
} }
func (rs *RedisSessionStore) Get(key interface{}) interface{} { func (rs *RedisSessionStore) Get(key interface{}) interface{} {
v, err := rs.c.Do("GET", rs.sid, key) //v, err := rs.c.Do("GET", rs.sid, key)
v, err := redis.String(rs.c.Do("HGET", rs.sid, key))
if err != nil { if err != nil {
return nil return nil
} }
@ -25,6 +31,7 @@ func (rs *RedisSessionStore) Get(key interface{}) interface{} {
} }
func (rs *RedisSessionStore) Delete(key interface{}) error { func (rs *RedisSessionStore) Delete(key interface{}) error {
//_, err := rs.c.Do("HDEL", rs.sid, key)
_, err := rs.c.Do("HDEL", rs.sid, key) _, err := rs.c.Do("HDEL", rs.sid, key)
return err return err
} }
@ -43,11 +50,37 @@ type RedisProvider struct {
} }
func (rp *RedisProvider) connectInit() redis.Conn { func (rp *RedisProvider) connectInit() redis.Conn {
c, err := redis.Dial("tcp", rp.savePath) /*c, err := redis.Dial("tcp", rp.savePath)
if err != nil { if err != nil {
return nil return nil
} }
return c return c*/
if redisPool == nil {
redisPool = make(chan redis.Conn, MAX_POOL_SIZE)
}
if len(redisPool) == 0 {
go func() {
for i := 0; i < MAX_POOL_SIZE/2; i++ {
c, err := redis.Dial("tcp", rp.savePath)
if err != nil {
panic(err)
}
putRedis(c)
}
}()
}
return <-redisPool
}
func putRedis(conn redis.Conn) {
if redisPool == nil {
redisPool = make(chan redis.Conn, MAX_POOL_SIZE)
}
if len(redisPool) == MAX_POOL_SIZE {
conn.Close()
return
}
redisPool <- conn
} }
func (rp *RedisProvider) SessionInit(maxlifetime int64, savePath string) error { func (rp *RedisProvider) SessionInit(maxlifetime int64, savePath string) error {
@ -58,8 +91,10 @@ func (rp *RedisProvider) SessionInit(maxlifetime int64, savePath string) error {
func (rp *RedisProvider) SessionRead(sid string) (SessionStore, error) { func (rp *RedisProvider) SessionRead(sid string) (SessionStore, error) {
c := rp.connectInit() c := rp.connectInit()
if str, err := redis.String(c.Do("GET", sid)); err != nil || str == "" { //if str, err := redis.String(c.Do("GET", sid)); err != nil || str == "" {
c.Do("SET", sid, sid, rp.maxlifetime) if str, err := redis.String(c.Do("HGET", sid, sid)); err != nil || str == "" {
//c.Do("SET", sid, sid, rp.maxlifetime)
c.Do("HSET", sid, sid, rp.maxlifetime)
} }
rs := &RedisSessionStore{c: c, sid: sid} rs := &RedisSessionStore{c: c, sid: sid}
return rs, nil return rs, nil