public_git/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2026-10-18 04:41:19 +02:00
Code Issues Projects Releases Wiki Activity

adding IdleTimeout with the redis-connection-idle-timeout flag, to ke… (#1691)

Browse Source 
* adding IdleTimeout with the redis-connection-idle-timeout flag, to keep redis connections in valid state, when Redis  option is set

* docs update - add redis idle timeout configurations

* changelog update for #1691 fix
This commit is contained in:
Dmitry Kartsev
2022-08-09 21:57:13 +01:00
committed by GitHub
parent 6e02bb496b
commit 0cfb9c6da0
6 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/options/options.go
+1 -1
View File
@@ -143,7 +143,7 @@ func NewFlagSet() *pflag.FlagSet {
flagSet.StringSlice("redis-sentinel-connection-urls", []string{}, "List of Redis sentinel connection URLs (eg redis://HOST[:PORT]). Used in conjunction with --redis-use-sentinel")
flagSet.Bool("redis-use-cluster", false, "Connect to redis cluster. Must set --redis-cluster-connection-urls to use this feature")
flagSet.StringSlice("redis-cluster-connection-urls", []string{}, "List of Redis cluster connection URLs (eg redis://HOST[:PORT]). Used in conjunction with --redis-use-cluster")
flagSet.Int("redis-connection-idle-timeout", 0, "Redis connection idle timeout seconds, if Redis timeout option is non-zero, the --redis-connection-idle-timeout must be less then Redis timeout option")
flagSet.String("signature-key", "", "GAP-Signature request signature key (algorithm:secretkey)")
flagSet.Bool("gcp-healthchecks", false, "Enable GCP/GKE healthcheck endpoints")
pkg/apis/options/sessions.go
+1
View File
@@ -32,6 +32,7 @@ type RedisStoreOptions struct {
ClusterConnectionURLs []string `flag:"redis-cluster-connection-urls" cfg:"redis_cluster_connection_urls"`
CAPath string `flag:"redis-ca-path" cfg:"redis_ca_path"`
InsecureSkipTLSVerify bool `flag:"redis-insecure-skip-tls-verify" cfg:"redis_insecure_skip_tls_verify"`
IdleTimeout int `flag:"redis-connection-idle-timeout" cfg:"redis_connection_idle_timeout"`
}
func sessionOptionsDefaults() SessionOptions {
pkg/sessions/redis/redis_store.go
+7 -3
View File
@@ -104,6 +104,7 @@ func buildSentinelClient(opts options.RedisStoreOptions) (Client, error) {
SentinelPassword: opts.SentinelPassword,
Password: opts.Password,
TLSConfig: opt.TLSConfig,
IdleTimeout: time.Duration(opts.IdleTimeout) * time.Second,
})
return newClient(client), nil
}
@@ -120,9 +121,10 @@ func buildClusterClient(opts options.RedisStoreOptions) (Client, error) {
}
client := redis.NewClusterClient(&redis.ClusterOptions{
Addrs: addrs,
Password: opts.Password,
TLSConfig: opt.TLSConfig,
Addrs: addrs,
Password: opts.Password,
TLSConfig: opt.TLSConfig,
IdleTimeout: time.Duration(opts.IdleTimeout) * time.Second,
})
return newClusterClient(client), nil
}
@@ -143,6 +145,8 @@ func buildStandaloneClient(opts options.RedisStoreOptions) (Client, error) {
return nil, err
}
opt.IdleTimeout = time.Duration(opts.IdleTimeout) * time.Second
client := redis.NewClient(opt)
return newClient(client), nil
}