Stop passing down tls_enabled argument
This argument is implemented in none of the available backends from dogpile. The only usage is found in own memcache_pool backend but the flag can be easily replaced by checking tls_context argument. Change-Id: I8176f427a5906dd68f34a44ee2c200fb76f10220 Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -67,7 +67,7 @@ class PooledMemcachedBackend(memcached_backend.MemcachedBackend):
|
||||
# Composed from GenericMemcachedBackend's and MemcacheArgs's __init__
|
||||
def __init__(self, arguments: dict[str, Any]) -> None:
|
||||
super().__init__(arguments) # type: ignore
|
||||
if arguments.get('tls_enabled', False) or arguments.get(
|
||||
if arguments.get('tls_context') is not None or arguments.get(
|
||||
'sasl_enabled', False
|
||||
):
|
||||
if arguments.get('sasl_enabled', False) and (
|
||||
|
||||
@@ -312,11 +312,6 @@ def _build_cache_config(conf: cfg.ConfigOpts) -> dict[str, Any]:
|
||||
tls_context.set_ciphers(conf.cache.tls_allowed_ciphers)
|
||||
|
||||
conf_dict[f'{prefix}.arguments.tls_context'] = tls_context
|
||||
|
||||
# pass the value of tls_enabled to the backend
|
||||
conf_dict[f'{prefix}.arguments.tls_enabled'] = (
|
||||
conf.cache.tls_enabled
|
||||
)
|
||||
elif conf.cache.backend in (
|
||||
'dogpile.cache.redis',
|
||||
'dogpile.cache.redis_sentinel',
|
||||
|
||||
Reference in New Issue
Block a user