mirror of
https://github.com/astaxie/beego.git
synced 2025-06-12 08:30:40 +00:00
Fixes #2587
Fixes warnings and errors raised by gometalinter and gosimple.
This commit is contained in:
@ -12,8 +12,10 @@ import (
|
||||
"github.com/siddontang/ledisdb/ledis"
|
||||
)
|
||||
|
||||
var ledispder = &Provider{}
|
||||
var c *ledis.DB
|
||||
var (
|
||||
ledispder = &Provider{}
|
||||
c *ledis.DB
|
||||
)
|
||||
|
||||
// SessionStore ledis session store
|
||||
type SessionStore struct {
|
||||
@ -97,27 +99,36 @@ func (lp *Provider) SessionInit(maxlifetime int64, savePath string) error {
|
||||
}
|
||||
cfg := new(config.Config)
|
||||
cfg.DataDir = lp.savePath
|
||||
nowLedis, err := ledis.Open(cfg)
|
||||
c, err = nowLedis.Select(lp.db)
|
||||
|
||||
var ledisInstance *ledis.Ledis
|
||||
ledisInstance, err = ledis.Open(cfg)
|
||||
if err != nil {
|
||||
println(err)
|
||||
return nil
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
c, err = ledisInstance.Select(lp.db)
|
||||
return err
|
||||
}
|
||||
|
||||
// SessionRead read ledis session by sid
|
||||
func (lp *Provider) SessionRead(sid string) (session.Store, error) {
|
||||
kvs, err := c.Get([]byte(sid))
|
||||
var kv map[interface{}]interface{}
|
||||
var (
|
||||
kv map[interface{}]interface{}
|
||||
kvs []byte
|
||||
err error
|
||||
)
|
||||
|
||||
if kvs, err = c.Get([]byte(sid)); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if len(kvs) == 0 {
|
||||
kv = make(map[interface{}]interface{})
|
||||
} else {
|
||||
kv, err = session.DecodeGob(kvs)
|
||||
if err != nil {
|
||||
if kv, err = session.DecodeGob(kvs); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
ls := &SessionStore{sid: sid, values: kv, maxlifetime: lp.maxlifetime}
|
||||
return ls, nil
|
||||
}
|
||||
@ -142,18 +153,7 @@ func (lp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error)
|
||||
c.Set([]byte(sid), data)
|
||||
c.Expire([]byte(sid), lp.maxlifetime)
|
||||
}
|
||||
kvs, err := c.Get([]byte(sid))
|
||||
var kv map[interface{}]interface{}
|
||||
if len(kvs) == 0 {
|
||||
kv = make(map[interface{}]interface{})
|
||||
} else {
|
||||
kv, err = session.DecodeGob(kvs)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
ls := &SessionStore{sid: sid, values: kv, maxlifetime: lp.maxlifetime}
|
||||
return ls, nil
|
||||
return lp.SessionRead(sid)
|
||||
}
|
||||
|
||||
// SessionDestroy delete ledis session by id
|
||||
@ -164,7 +164,6 @@ func (lp *Provider) SessionDestroy(sid string) error {
|
||||
|
||||
// SessionGC Impelment method, no used.
|
||||
func (lp *Provider) SessionGC() {
|
||||
return
|
||||
}
|
||||
|
||||
// SessionAll return all active session
|
||||
|
Reference in New Issue
Block a user