test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Fix setting redis db path (#15698) (#15708) 

Backport #15698

There is a bug setting the redis db in the common nosql manager whereby the db path
always fails.

This PR fixes this.

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2021-05-03 22:30:30 +01:00 committed by GitHub
parent cead819cb5
commit 462c6fdee2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/nosql/manager_redis.go
View File

@ -152,7 +152,7 @@ func (m *Manager) GetRedisClient(connection string) redis.UniversalClient {
opts.Addrs = append(opts.Addrs, strings.Split(uri.Host, ",")...) opts.Addrs = append(opts.Addrs, strings.Split(uri.Host, ",")...)
} }
if uri.Path != "" { if uri.Path != "" {
if db, err := strconv.Atoi(uri.Path); err == nil { if db, err := strconv.Atoi(uri.Path[1:]); err == nil {
opts.DB = db opts.DB = db
} }
} }
@ -168,7 +168,7 @@ func (m *Manager) GetRedisClient(connection string) redis.UniversalClient {
opts.Addrs = append(opts.Addrs, strings.Split(uri.Host, ",")...) opts.Addrs = append(opts.Addrs, strings.Split(uri.Host, ",")...)
} }
if uri.Path != "" { if uri.Path != "" {
if db, err := strconv.Atoi(uri.Path); err == nil { if db, err := strconv.Atoi(uri.Path[1:]); err == nil {
opts.DB = db opts.DB = db
} }
} }
@ -186,7 +186,7 @@ func (m *Manager) GetRedisClient(connection string) redis.UniversalClient {
opts.Addrs = append(opts.Addrs, strings.Split(uri.Host, ",")...) opts.Addrs = append(opts.Addrs, strings.Split(uri.Host, ",")...)
} }
if uri.Path != "" { if uri.Path != "" {
if db, err := strconv.Atoi(uri.Path); err == nil { if db, err := strconv.Atoi(uri.Path[1:]); err == nil {
opts.DB = db opts.DB = db
} }
} }