@@ -114,7 +114,7 @@ func CreateCachingBucket(chunksConfig ChunksCacheConfig, metadataConfig Metadata
114
114
cfg := cache .NewCachingBucketConfig ()
115
115
cachingConfigured := false
116
116
117
- chunksCache , err := createCache ("chunks-cache" , chunksConfig .Backend , chunksConfig . Memcached , chunksConfig . Redis , logger , reg )
117
+ chunksCache , err := createCache ("chunks-cache" , & chunksConfig .CacheBackend , logger , reg )
118
118
if err != nil {
119
119
return nil , errors .Wrapf (err , "chunks-cache" )
120
120
}
@@ -124,7 +124,7 @@ func CreateCachingBucket(chunksConfig ChunksCacheConfig, metadataConfig Metadata
124
124
cfg .CacheGetRange ("chunks" , chunksCache , isTSDBChunkFile , chunksConfig .SubrangeSize , chunksConfig .AttributesTTL , chunksConfig .SubrangeTTL , chunksConfig .MaxGetRangeRequests )
125
125
}
126
126
127
- metadataCache , err := createCache ("metadata-cache" , metadataConfig .Backend , metadataConfig . Memcached , metadataConfig . Redis , logger , reg )
127
+ metadataCache , err := createCache ("metadata-cache" , & metadataConfig .CacheBackend , logger , reg )
128
128
if err != nil {
129
129
return nil , errors .Wrapf (err , "metadata-cache" )
130
130
}
@@ -152,29 +152,29 @@ func CreateCachingBucket(chunksConfig ChunksCacheConfig, metadataConfig Metadata
152
152
return storecache .NewCachingBucket (bkt , cfg , logger , reg )
153
153
}
154
154
155
- func createCache (cacheName string , backend string , memcached MemcachedClientConfig , redis RedisClientConfig , logger log.Logger , reg prometheus.Registerer ) (cache.Cache , error ) {
156
- switch backend {
155
+ func createCache (cacheName string , cacheBackend * CacheBackend , logger log.Logger , reg prometheus.Registerer ) (cache.Cache , error ) {
156
+ switch cacheBackend . Backend {
157
157
case "" :
158
158
// No caching.
159
159
return nil , nil
160
160
161
161
case CacheBackendMemcached :
162
162
var client cacheutil.MemcachedClient
163
- client , err := cacheutil .NewMemcachedClientWithConfig (logger , cacheName , memcached .ToMemcachedClientConfig (), reg )
163
+ client , err := cacheutil .NewMemcachedClientWithConfig (logger , cacheName , cacheBackend . Memcached .ToMemcachedClientConfig (), reg )
164
164
if err != nil {
165
165
return nil , errors .Wrapf (err , "failed to create memcached client" )
166
166
}
167
167
return cache .NewMemcachedCache (cacheName , logger , client , reg ), nil
168
168
169
169
case CacheBackendRedis :
170
- redisCache , err := cacheutil .NewRedisClientWithConfig (logger , cacheName , redis .ToRedisClientConfig (), reg )
170
+ redisCache , err := cacheutil .NewRedisClientWithConfig (logger , cacheName , cacheBackend . Redis .ToRedisClientConfig (), reg )
171
171
if err != nil {
172
172
return nil , errors .Wrapf (err , "failed to create redis client" )
173
173
}
174
174
return cache .NewRedisCache (cacheName , logger , redisCache , reg ), nil
175
175
176
176
default :
177
- return nil , errors .Errorf ("unsupported cache type for cache %s: %s" , cacheName , backend )
177
+ return nil , errors .Errorf ("unsupported cache type for cache %s: %s" , cacheName , cacheBackend . Backend )
178
178
}
179
179
}
180
180
0 commit comments