go-packages/iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-03-13 21:36:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add clusters support for sessiondb:redis:Radix() #1339

Browse Source 
Former-commit-id: d748d1e19a29851abbbfc0264fd04c462158b645
This commit is contained in:
Gerasimos (Makis) Maropoulos 2019-08-20 12:29:54 +03:00
parent 07046ab978
commit 2cd217f110
2 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sessions/sessiondb/redis/database.go
View File

@ -24,8 +24,14 @@ const (
type Config struct {
// Network protocol. Defaults to "tcp".
Network string
// Addr of the redis server. Defaults to "127.0.0.1:6379".
// Addr of a single redis server instance.
// See "Clusters" field for clusters support.
// Defaults to "127.0.0.1:6379".
Addr string
// Clusters a list of network addresses for clusters.
// If not empty "Addr" is ignored.
// Currently only Radix() Driver supports it.
Clusters []string
// Password string .If no password then no 'AUTH'. Defaults to "".
Password string
// If Database is empty "" then no 'SELECT'. Defaults to "".

64
sessions/sessiondb/redis/driver_radix.go
View File

@ -2,6 +2,7 @@ package redis
import (
"fmt"
"math/rand"
"strconv"
"github.com/mediocregopher/radix/v3"
@ -39,32 +40,49 @@ func (r *RadixDriver) Connect(c Config) error {
c.Delim = DefaultDelim
}
customConnFunc := func(network, addr string) (radix.Conn, error) {
var options []radix.DialOpt
var options []radix.DialOpt
if c.Password != "" {
options = append(options, radix.DialAuthPass(c.Password))
}
if c.Timeout > 0 {
options = append(options, radix.DialTimeout(c.Timeout))
}
if c.Database != "" { // *dialOpts.selectDb is not exported on the 3rd-party library,
// but on its `DialSelectDB` option it does this:
// do.selectDB = strconv.Itoa(db) -> (string to int)
// so we can pass that string as int and it should work.
dbIndex, err := strconv.Atoi(c.Database)
if err == nil {
options = append(options, radix.DialSelectDB(dbIndex))
}
}
return radix.Dial(network, addr, options...)
if c.Password != "" {
options = append(options, radix.DialAuthPass(c.Password))
}
pool, err := radix.NewPool(c.Network, c.Addr, c.MaxActive, radix.PoolConnFunc(customConnFunc))
if c.Timeout > 0 {
options = append(options, radix.DialTimeout(c.Timeout))
}
if c.Database != "" { // *dialOpts.selectDb is not exported on the 3rd-party library,
// but on its `DialSelectDB` option it does this:
// do.selectDB = strconv.Itoa(db) -> (string to int)
// so we can pass that string as int and it should work.
dbIndex, err := strconv.Atoi(c.Database)
if err == nil {
options = append(options, radix.DialSelectDB(dbIndex))
}
}
var connFunc radix.ConnFunc
if len(c.Clusters) > 0 {
cluster, err := radix.NewCluster(c.Clusters)
if err != nil {
// maybe an
// ERR This instance has cluster support disabled
return err
}
connFunc = func(network, addr string) (radix.Conn, error) {
topo := cluster.Topo()
node := topo[rand.Intn(len(topo))]
return radix.Dial(c.Network, node.Addr, options...)
}
} else {
connFunc = func(network, addr string) (radix.Conn, error) {
return radix.Dial(c.Network, c.Addr, options...)
}
}
pool, err := radix.NewPool(c.Network, c.Addr, c.MaxActive, radix.PoolConnFunc(connFunc))
if err != nil {
return err
}