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

Merge pull request #3100 from godcong/master

Browse Source 
change github.com/garyburd/redigo to newest branch github.com/gomodul…
This commit is contained in:
astaxie 2018-04-20 19:40:30 +08:00 committed by GitHub
commit 9d526dfd50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -23,7 +23,7 @@ install:
- go get github.com/go-sql-driver/mysql - go get github.com/go-sql-driver/mysql
- go get github.com/mattn/go-sqlite3 - go get github.com/mattn/go-sqlite3
- go get github.com/bradfitz/gomemcache/memcache - go get github.com/bradfitz/gomemcache/memcache
- go get github.com/garyburd/redigo/redis - go get github.com/gomodule/redigo/redis
- go get github.com/beego/x2j - go get github.com/beego/x2j
- go get github.com/couchbase/go-couchbase - go get github.com/couchbase/go-couchbase
- go get github.com/beego/goyaml2 - go get github.com/beego/goyaml2

2
cache/README.md vendored
View File

@ -52,7 +52,7 @@ Configure like this:
## Redis adapter ## Redis adapter
Redis adapter use the [redigo](http://github.com/garyburd/redigo) client. Redis adapter use the [redigo](http://github.com/gomodule/redigo) client.
Configure like this: Configure like this:

6
cache/redis/redis.go vendored
View File

@ -14,9 +14,9 @@
// Package redis for cache provider // Package redis for cache provider
// //
// depend on github.com/garyburd/redigo/redis // depend on github.com/gomodule/redigo/redis
// //
// go install github.com/garyburd/redigo/redis // go install github.com/gomodule/redigo/redis
// //
// Usage: // Usage:
// import( // import(
@ -36,7 +36,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/garyburd/redigo/redis" "github.com/gomodule/redigo/redis"
"github.com/astaxie/beego/cache" "github.com/astaxie/beego/cache"
) )

2
cache/redis/redis_test.go vendored
View File

@ -19,7 +19,7 @@ import (
"time" "time"
"github.com/astaxie/beego/cache" "github.com/astaxie/beego/cache"
"github.com/garyburd/redigo/redis" "github.com/gomodule/redigo/redis"
) )
func TestRedisCache(t *testing.T) { func TestRedisCache(t *testing.T) {

15
session/redis/sess_redis.go
View File

@ -14,9 +14,9 @@
// Package redis for session provider // Package redis for session provider
// //
// depend on github.com/garyburd/redigo/redis // depend on github.com/gomodule/redigo/redis
// //
// go install github.com/garyburd/redigo/redis // go install github.com/gomodule/redigo/redis
// //
// Usage: // Usage:
// import( // import(
@ -40,7 +40,7 @@ import (
"github.com/astaxie/beego/session" "github.com/astaxie/beego/session"
"github.com/garyburd/redigo/redis" "github.com/gomodule/redigo/redis"
) )
var redispder = &Provider{} var redispder = &Provider{}
@ -149,7 +149,8 @@ func (rp *Provider) SessionInit(maxlifetime int64, savePath string) error {
} else { } else {
rp.dbNum = 0 rp.dbNum = 0
} }
rp.poollist = redis.NewPool(func() (redis.Conn, error) { rp.poollist = &redis.Pool{
Dial: func() (redis.Conn, error) {
c, err := redis.Dial("tcp", rp.savePath) c, err := redis.Dial("tcp", rp.savePath)
if err != nil { if err != nil {
return nil, err return nil, err
@ -160,7 +161,7 @@ func (rp *Provider) SessionInit(maxlifetime int64, savePath string) error {
return nil, err return nil, err
} }
} }
//some redis proxy such as twemproxy is not support select command // some redis proxy such as twemproxy is not support select command
if rp.dbNum > 0 { if rp.dbNum > 0 {
_, err = c.Do("SELECT", rp.dbNum) _, err = c.Do("SELECT", rp.dbNum)
if err != nil { if err != nil {
@ -169,7 +170,9 @@ func (rp *Provider) SessionInit(maxlifetime int64, savePath string) error {
} }
} }
return c, err return c, err
}, rp.poolsize) },
MaxIdle: rp.poolsize,
}
return rp.poollist.Get().Err() return rp.poollist.Get().Err()
} }