github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-09-17 23:59:57 +00:00
Code Issues Projects Releases Wiki Activity

feat: extract redis config to separate struct

Browse Source 
Signed-off-by: Mateusz Urbanek <mateusz.urbanek.98@gmail.com>
This commit is contained in:
Mateusz Urbanek
2025-04-10 16:51:43 +02:00
parent e028a30ecd
commit fcb2deac0b
3 changed files with 136 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
registry/handlers/app.go
View File

@@ -536,6 +536,40 @@ func (app *App) configureRedis(cfg *configuration.Configuration) {
return
}
opts := redis.UniversalOptions{
Addrs: cfg.Redis.Options.Addrs,
ClientName: cfg.Redis.Options.ClientName,
DB: cfg.Redis.Options.DB,
Protocol: cfg.Redis.Options.Protocol,
Username: cfg.Redis.Options.Username,
Password: cfg.Redis.Options.Password,
SentinelUsername: cfg.Redis.Options.SentinelUsername,
SentinelPassword: cfg.Redis.Options.SentinelPassword,
MaxRetries: cfg.Redis.Options.MaxRetries,
MinRetryBackoff: cfg.Redis.Options.MinRetryBackoff,
MaxRetryBackoff: cfg.Redis.Options.MaxRetryBackoff,
DialTimeout: cfg.Redis.Options.DialTimeout,
ReadTimeout: cfg.Redis.Options.ReadTimeout,
WriteTimeout: cfg.Redis.Options.WriteTimeout,
ContextTimeoutEnabled: cfg.Redis.Options.ContextTimeoutEnabled,
PoolFIFO: cfg.Redis.Options.PoolFIFO,
PoolSize: cfg.Redis.Options.PoolSize,
PoolTimeout: cfg.Redis.Options.PoolTimeout,
MinIdleConns: cfg.Redis.Options.MinIdleConns,
MaxIdleConns: cfg.Redis.Options.MaxIdleConns,
MaxActiveConns: cfg.Redis.Options.MaxActiveConns,
ConnMaxIdleTime: cfg.Redis.Options.ConnMaxIdleTime,
ConnMaxLifetime: cfg.Redis.Options.ConnMaxLifetime,
MaxRedirects: cfg.Redis.Options.MaxRedirects,
ReadOnly: cfg.Redis.Options.ReadOnly,
RouteByLatency: cfg.Redis.Options.RouteByLatency,
RouteRandomly: cfg.Redis.Options.RouteRandomly,
MasterName: cfg.Redis.Options.MasterName,
DisableIdentity: cfg.Redis.Options.DisableIdentity,
IdentitySuffix: cfg.Redis.Options.IdentitySuffix,
UnstableResp3: cfg.Redis.Options.UnstableResp3,
}
// redis TLS config
if cfg.Redis.TLS.Certificate != "" || cfg.Redis.TLS.Key != "" {
var err error
@@ -562,10 +596,10 @@ func (app *App) configureRedis(cfg *configuration.Configuration) {
tlsConf.ClientAuth = tls.RequireAndVerifyClientCert
tlsConf.ClientCAs = pool
}
cfg.Redis.Options.TLSConfig = tlsConf
opts.TLSConfig = tlsConf
}
app.redis = app.createPool(cfg.Redis.Options)
app.redis = app.createPool(opts)
// Enable metrics instrumentation.
if err := redisotel.InstrumentMetrics(app.redis); err != nil {