diff options
| author | Christopher Speller <crspeller@gmail.com> | 2018-06-21 13:10:40 -0700 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2018-06-21 16:10:40 -0400 |
| commit | 8526739066ccb00ccd24b74650a7d7b284442985 (patch) | |
| tree | 282512ae2ad95c98a9ca82de304a410b6b56685c /vendor/github.com/go-redis/redis/universal.go | |
| parent | a59ccaa8b3844895dde3980e6224fef46ff4a1c8 (diff) | |
| download | chat-8526739066ccb00ccd24b74650a7d7b284442985.tar.gz chat-8526739066ccb00ccd24b74650a7d7b284442985.tar.bz2 chat-8526739066ccb00ccd24b74650a7d7b284442985.zip | |
MM-10934 Update server dependencies. (#8981)
* Changing throttled import path.
* Upgrading dependencies.
Diffstat (limited to 'vendor/github.com/go-redis/redis/universal.go')
| -rw-r--r-- | vendor/github.com/go-redis/redis/universal.go | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/vendor/github.com/go-redis/redis/universal.go b/vendor/github.com/go-redis/redis/universal.go index fde3c4150..9e30c81d9 100644 --- a/vendor/github.com/go-redis/redis/universal.go +++ b/vendor/github.com/go-redis/redis/universal.go @@ -1,6 +1,9 @@ package redis -import "time" +import ( + "crypto/tls" + "time" +) // UniversalOptions information is required by UniversalClient to establish // connections. @@ -27,6 +30,7 @@ type UniversalOptions struct { // Common options + OnConnect func(*Conn) error MaxRetries int Password string DialTimeout time.Duration @@ -36,6 +40,7 @@ type UniversalOptions struct { PoolTimeout time.Duration IdleTimeout time.Duration IdleCheckFrequency time.Duration + TLSConfig *tls.Config } func (o *UniversalOptions) cluster() *ClusterOptions { @@ -49,6 +54,7 @@ func (o *UniversalOptions) cluster() *ClusterOptions { RouteByLatency: o.RouteByLatency, ReadOnly: o.ReadOnly, + OnConnect: o.OnConnect, MaxRetries: o.MaxRetries, Password: o.Password, DialTimeout: o.DialTimeout, @@ -58,6 +64,7 @@ func (o *UniversalOptions) cluster() *ClusterOptions { PoolTimeout: o.PoolTimeout, IdleTimeout: o.IdleTimeout, IdleCheckFrequency: o.IdleCheckFrequency, + TLSConfig: o.TLSConfig, } } @@ -71,6 +78,7 @@ func (o *UniversalOptions) failover() *FailoverOptions { MasterName: o.MasterName, DB: o.DB, + OnConnect: o.OnConnect, MaxRetries: o.MaxRetries, Password: o.Password, DialTimeout: o.DialTimeout, @@ -80,6 +88,7 @@ func (o *UniversalOptions) failover() *FailoverOptions { PoolTimeout: o.PoolTimeout, IdleTimeout: o.IdleTimeout, IdleCheckFrequency: o.IdleCheckFrequency, + TLSConfig: o.TLSConfig, } } @@ -93,6 +102,7 @@ func (o *UniversalOptions) simple() *Options { Addr: addr, DB: o.DB, + OnConnect: o.OnConnect, MaxRetries: o.MaxRetries, Password: o.Password, DialTimeout: o.DialTimeout, @@ -102,6 +112,7 @@ func (o *UniversalOptions) simple() *Options { PoolTimeout: o.PoolTimeout, IdleTimeout: o.IdleTimeout, IdleCheckFrequency: o.IdleCheckFrequency, + TLSConfig: o.TLSConfig, } } @@ -113,6 +124,7 @@ func (o *UniversalOptions) simple() *Options { // applications locally. type UniversalClient interface { Cmdable + Watch(fn func(*Tx) error, keys ...string) error Process(cmd Cmder) error WrapProcess(fn func(oldProcess func(cmd Cmder) error) func(cmd Cmder) error) Subscribe(channels ...string) *PubSub |