mirror of
https://github.com/astaxie/beego.git
synced 2024-11-22 08:40:54 +00:00
Merge pull request #3339 from GNURub/hotfix/redis-uri
Support redis URI format
This commit is contained in:
commit
c4ed5030da
9
cache/redis/redis.go
vendored
9
cache/redis/redis.go
vendored
@ -39,6 +39,7 @@ import (
|
|||||||
"github.com/gomodule/redigo/redis"
|
"github.com/gomodule/redigo/redis"
|
||||||
|
|
||||||
"github.com/astaxie/beego/cache"
|
"github.com/astaxie/beego/cache"
|
||||||
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -164,6 +165,14 @@ func (rc *Cache) StartAndGC(config string) error {
|
|||||||
if _, ok := cf["conn"]; !ok {
|
if _, ok := cf["conn"]; !ok {
|
||||||
return errors.New("config has no conn key")
|
return errors.New("config has no conn key")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Format redis://<password>@<host>:<port>
|
||||||
|
cf["conn"] = strings.Replace(cf["conn"], "redis://", "", 1)
|
||||||
|
if i := strings.Index(cf["conn"], "@"); i > -1 {
|
||||||
|
cf["password"] = cf["conn"][0:i]
|
||||||
|
cf["conn"] = cf["conn"][i+1:]
|
||||||
|
}
|
||||||
|
|
||||||
if _, ok := cf["dbNum"]; !ok {
|
if _, ok := cf["dbNum"]; !ok {
|
||||||
cf["dbNum"] = "0"
|
cf["dbNum"] = "0"
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user