barometer: update DMA's vendoring packages

[barometer.git] / src / dma / vendor / github.com / go-redis / redis / universal.go

diff --git a/src/dma/vendor/github.com/go-redis/redis/universal.go b/src/dma/vendor/github.com/go-redis/redis/universal.go
index 9e30c81..a607562 100644 (file)
--- a/src/dma/vendor/github.com/go-redis/redis/universal.go
+++ b/src/dma/vendor/github.com/go-redis/redis/universal.go
@@ -12,35 +12,38 @@ type UniversalOptions struct {
        // of cluster/sentinel nodes.
        Addrs []string
 
-       // The sentinel master name.
-       // Only failover clients.
-       MasterName string
-
        // Database to be selected after connecting to the server.
        // Only single-node and failover clients.
        DB int
 
-       // Only cluster clients.
-
-       // Enables read only queries on slave nodes.
-       ReadOnly bool
-
-       MaxRedirects   int
-       RouteByLatency bool
-
-       // Common options
+       // Common options.
 
        OnConnect          func(*Conn) error
-       MaxRetries         int
        Password           string
+       MaxRetries         int
+       MinRetryBackoff    time.Duration
+       MaxRetryBackoff    time.Duration
        DialTimeout        time.Duration
        ReadTimeout        time.Duration
        WriteTimeout       time.Duration
        PoolSize           int
+       MinIdleConns       int
+       MaxConnAge         time.Duration
        PoolTimeout        time.Duration
        IdleTimeout        time.Duration
        IdleCheckFrequency time.Duration
        TLSConfig          *tls.Config
+
+       // Only cluster clients.
+
+       MaxRedirects   int
+       ReadOnly       bool
+       RouteByLatency bool
+       RouteRandomly  bool
+
+       // The sentinel master name.
+       // Only failover clients.
+       MasterName string
 }
 
 func (o *UniversalOptions) cluster() *ClusterOptions {
@@ -49,22 +52,31 @@ func (o *UniversalOptions) cluster() *ClusterOptions {
        }
 
        return &ClusterOptions{
-               Addrs:          o.Addrs,
+               Addrs:     o.Addrs,
+               OnConnect: o.OnConnect,
+
+               Password: o.Password,
+
                MaxRedirects:   o.MaxRedirects,
-               RouteByLatency: o.RouteByLatency,
                ReadOnly:       o.ReadOnly,
+               RouteByLatency: o.RouteByLatency,
+               RouteRandomly:  o.RouteRandomly,
+
+               MaxRetries:      o.MaxRetries,
+               MinRetryBackoff: o.MinRetryBackoff,
+               MaxRetryBackoff: o.MaxRetryBackoff,
 
-               OnConnect:          o.OnConnect,
-               MaxRetries:         o.MaxRetries,
-               Password:           o.Password,
                DialTimeout:        o.DialTimeout,
                ReadTimeout:        o.ReadTimeout,
                WriteTimeout:       o.WriteTimeout,
                PoolSize:           o.PoolSize,
+               MinIdleConns:       o.MinIdleConns,
+               MaxConnAge:         o.MaxConnAge,
                PoolTimeout:        o.PoolTimeout,
                IdleTimeout:        o.IdleTimeout,
                IdleCheckFrequency: o.IdleCheckFrequency,
-               TLSConfig:          o.TLSConfig,
+
+               TLSConfig: o.TLSConfig,
        }
 }
 
@@ -76,19 +88,27 @@ func (o *UniversalOptions) failover() *FailoverOptions {
        return &FailoverOptions{
                SentinelAddrs: o.Addrs,
                MasterName:    o.MasterName,
-               DB:            o.DB,
+               OnConnect:     o.OnConnect,
+
+               DB:       o.DB,
+               Password: o.Password,
+
+               MaxRetries:      o.MaxRetries,
+               MinRetryBackoff: o.MinRetryBackoff,
+               MaxRetryBackoff: o.MaxRetryBackoff,
+
+               DialTimeout:  o.DialTimeout,
+               ReadTimeout:  o.ReadTimeout,
+               WriteTimeout: o.WriteTimeout,
 
-               OnConnect:          o.OnConnect,
-               MaxRetries:         o.MaxRetries,
-               Password:           o.Password,
-               DialTimeout:        o.DialTimeout,
-               ReadTimeout:        o.ReadTimeout,
-               WriteTimeout:       o.WriteTimeout,
                PoolSize:           o.PoolSize,
+               MinIdleConns:       o.MinIdleConns,
+               MaxConnAge:         o.MaxConnAge,
                PoolTimeout:        o.PoolTimeout,
                IdleTimeout:        o.IdleTimeout,
                IdleCheckFrequency: o.IdleCheckFrequency,
-               TLSConfig:          o.TLSConfig,
+
+               TLSConfig: o.TLSConfig,
        }
 }
 
@@ -99,20 +119,28 @@ func (o *UniversalOptions) simple() *Options {
        }
 
        return &Options{
-               Addr: addr,
-               DB:   o.DB,
+               Addr:      addr,
+               OnConnect: o.OnConnect,
+
+               DB:       o.DB,
+               Password: o.Password,
+
+               MaxRetries:      o.MaxRetries,
+               MinRetryBackoff: o.MinRetryBackoff,
+               MaxRetryBackoff: o.MaxRetryBackoff,
+
+               DialTimeout:  o.DialTimeout,
+               ReadTimeout:  o.ReadTimeout,
+               WriteTimeout: o.WriteTimeout,
 
-               OnConnect:          o.OnConnect,
-               MaxRetries:         o.MaxRetries,
-               Password:           o.Password,
-               DialTimeout:        o.DialTimeout,
-               ReadTimeout:        o.ReadTimeout,
-               WriteTimeout:       o.WriteTimeout,
                PoolSize:           o.PoolSize,
+               MinIdleConns:       o.MinIdleConns,
+               MaxConnAge:         o.MaxConnAge,
                PoolTimeout:        o.PoolTimeout,
                IdleTimeout:        o.IdleTimeout,
                IdleCheckFrequency: o.IdleCheckFrequency,
-               TLSConfig:          o.TLSConfig,
+
+               TLSConfig: o.TLSConfig,
        }
 }