git-sync/crawlab
1
0
Fork 0
mirror of https://github.com/crawlab-team/crawlab.git synced 2026-01-25 17:42:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #868 from hantmac/fix/redis_special_pswd

Browse Source 
support redis password contains special char
This commit is contained in:
Jeremy
2020-10-29 10:11:47 +08:00
committed by GitHub
parent 43f98543b3 6a5052c76a
commit d009fb9b9c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/database/redis.go
View File

@@ -9,6 +9,7 @@ import (
"github.com/cenkalti/backoff/v4" "github.com/cenkalti/backoff/v4"
"github.com/gomodule/redigo/redis" "github.com/gomodule/redigo/redis"
"github.com/spf13/viper" "github.com/spf13/viper"
"net/url"
"runtime/debug" "runtime/debug"
"strings" "strings"
"time" "time"
@@ -167,17 +168,17 @@ func NewRedisPool() *redis.Pool {
var address = viper.GetString("redis.address") var address = viper.GetString("redis.address")
var port = viper.GetString("redis.port") var port = viper.GetString("redis.port")
var database = viper.GetString("redis.database") var database = viper.GetString("redis.database")
var password = viper.GetString("redis.password") var password = url.QueryEscape(viper.GetString("redis.password"))
var url string var redisUrl string
if password == "" { if password == "" {
url = "redis://" + address + ":" + port + "/" + database redisUrl = "redis://" + address + ":" + port + "/" + database
} else { } else {
url = "redis://x:" + password + "@" + address + ":" + port + "/" + database redisUrl = "redis://x:" + password + "@" + address + ":" + port + "/" + database
} }
return &redis.Pool{ return &redis.Pool{
Dial: func() (conn redis.Conn, e error) { Dial: func() (conn redis.Conn, e error) {
return redis.DialURL(url, return redis.DialURL(redisUrl,
redis.DialConnectTimeout(time.Second*10), redis.DialConnectTimeout(time.Second*10),
redis.DialReadTimeout(time.Second*600), redis.DialReadTimeout(time.Second*600),
redis.DialWriteTimeout(time.Second*10), redis.DialWriteTimeout(time.Second*10),