openstack/oslo.cache
Code Issues Proposed changes

Use f-string when creating config dict

Browse Source 
... to simplify the logics to compose keys.

Change-Id: Ie6c648802a97f337d5e5b432eec90b75c40feb1b
This commit is contained in:
Takashi Kajinami
2024-06-03 19:27:00 +09:00
parent 32037788a3
commit bb468f21bf
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
oslo_cache/core.py
View File

@@ -122,10 +122,10 @@ def _build_cache_config(conf):
""" """
prefix = conf.cache.config_prefix prefix = conf.cache.config_prefix
conf_dict = {} conf_dict = {}
conf_dict['%s.backend' % prefix] = _opts._DEFAULT_BACKEND conf_dict[f'{prefix}.backend'] = _opts._DEFAULT_BACKEND
if conf.cache.enabled is True: if conf.cache.enabled is True:
conf_dict['%s.backend' % prefix] = conf.cache.backend conf_dict[f'{prefix}.backend'] = conf.cache.backend
conf_dict['%s.expiration_time' % prefix] = conf.cache.expiration_time conf_dict[f'{prefix}.expiration_time'] = conf.cache.expiration_time
for argument in conf.cache.backend_argument: for argument in conf.cache.backend_argument:
try: try:
(argname, argvalue) = argument.split(':', 1) (argname, argvalue) = argument.split(':', 1)
@@ -169,20 +169,20 @@ def _build_cache_config(conf):
netloc=netloc, path='', params='', query='', fragment='') netloc=netloc, path='', params='', query='', fragment='')
conf_dict.setdefault( conf_dict.setdefault(
'%s.arguments.url' % prefix, f'{prefix}.arguments.url',
urllib.parse.urlunparse(parts) urllib.parse.urlunparse(parts)
) )
for arg in ('socket_timeout',): for arg in ('socket_timeout',):
value = getattr(conf.cache, 'redis_' + arg) value = getattr(conf.cache, 'redis_' + arg)
conf_dict['%s.arguments.%s' % (prefix, arg)] = value conf_dict[f'{prefix}.arguments.{arg}'] = value
elif conf.cache.backend == 'dogpile.cache.redis_sentinel': elif conf.cache.backend == 'dogpile.cache.redis_sentinel':
for arg in ('username', 'password', 'socket_timeout'): for arg in ('username', 'password', 'socket_timeout'):
value = getattr(conf.cache, 'redis_' + arg) value = getattr(conf.cache, 'redis_' + arg)
conf_dict['%s.arguments.%s' % (prefix, arg)] = value conf_dict[f'{prefix}.arguments.{arg}'] = value
conf_dict['%s.arguments.service_name' % prefix] = \ conf_dict[f'{prefix}.arguments.service_name'] = \
conf.cache.redis_sentinel_service_name conf.cache.redis_sentinel_service_name
if conf.cache.redis_sentinels: if conf.cache.redis_sentinels:
conf_dict['%s.arguments.sentinels' % prefix] = [ conf_dict[f'{prefix}.arguments.sentinels'] = [
_parse_sentinel(s) for s in conf.cache.redis_sentinels] _parse_sentinel(s) for s in conf.cache.redis_sentinels]
else: else:
# NOTE(yorik-sar): these arguments will be used for memcache-related # NOTE(yorik-sar): these arguments will be used for memcache-related
@@ -208,7 +208,7 @@ def _build_cache_config(conf):
# #
# The normal non-pooled clients connect explicitly on each use and # The normal non-pooled clients connect explicitly on each use and
# does not need the explicit flush_on_reconnect # does not need the explicit flush_on_reconnect
conf_dict.setdefault('%s.arguments.url' % prefix, conf_dict.setdefault(f'{prefix}.arguments.url',
conf.cache.memcache_servers) conf.cache.memcache_servers)
for arg in ('dead_retry', 'socket_timeout', 'pool_maxsize', for arg in ('dead_retry', 'socket_timeout', 'pool_maxsize',
@@ -216,7 +216,7 @@ def _build_cache_config(conf):
'pool_flush_on_reconnect', 'sasl_enabled', 'username', 'pool_flush_on_reconnect', 'sasl_enabled', 'username',
'password'): 'password'):
value = getattr(conf.cache, 'memcache_' + arg) value = getattr(conf.cache, 'memcache_' + arg)
conf_dict['%s.arguments.%s' % (prefix, arg)] = value conf_dict[f'{prefix}.arguments.{arg}'] = value
if conf.cache.tls_enabled: if conf.cache.tls_enabled:
if conf.cache.backend in ('dogpile.cache.bmemcache', if conf.cache.backend in ('dogpile.cache.bmemcache',
@@ -255,7 +255,7 @@ def _build_cache_config(conf):
) )
tls_context.set_ciphers(conf.cache.tls_allowed_ciphers) tls_context.set_ciphers(conf.cache.tls_allowed_ciphers)
conf_dict['%s.arguments.tls_context' % prefix] = tls_context conf_dict[f'{prefix}.arguments.tls_context'] = tls_context
elif conf.cache.backend in ('dogpile.cache.redis', elif conf.cache.backend in ('dogpile.cache.redis',
'dogpile.cache.redis_sentinel'): 'dogpile.cache.redis_sentinel'):
if conf.cache.tls_allowed_ciphers is not None: if conf.cache.tls_allowed_ciphers is not None:
@@ -281,12 +281,12 @@ def _build_cache_config(conf):
}) })
if conf.cache.backend == 'dogpile.cache.redis_sentinel': if conf.cache.backend == 'dogpile.cache.redis_sentinel':
conn_kwargs.update({'ssl': True}) conn_kwargs.update({'ssl': True})
conf_dict['%s.arguments.connection_kwargs' % prefix] = \ conf_dict[f'{prefix}.arguments.connection_kwargs'] = \
conn_kwargs conn_kwargs
conf_dict['%s.arguments.sentinel_kwargs' % prefix] = \ conf_dict[f'{prefix}.arguments.sentinel_kwargs'] = \
conn_kwargs conn_kwargs
else: else:
conf_dict['%s.arguments.connection_kwargs' % prefix] = \ conf_dict[f'{prefix}.arguments.connection_kwargs'] = \
conn_kwargs conn_kwargs
else: else:
raise exception.ConfigurationError( raise exception.ConfigurationError(
@@ -312,7 +312,7 @@ def _build_cache_config(conf):
# As with the TLS context above, the config dict below will be # As with the TLS context above, the config dict below will be
# consumed by dogpile.cache that will be used as a proxy between # consumed by dogpile.cache that will be used as a proxy between
# oslo.cache and pymemcache. # oslo.cache and pymemcache.
conf_dict['%s.arguments.socket_keepalive' % prefix] = \ conf_dict[f'{prefix}.arguments.socket_keepalive'] = \
socket_keepalive socket_keepalive
elif conf.cache.backend in ('dogpile.cache.redis', elif conf.cache.backend in ('dogpile.cache.redis',
'dogpile.cache.redis_sentinel'): 'dogpile.cache.redis_sentinel'):
@@ -322,7 +322,7 @@ def _build_cache_config(conf):
socket.TCP_KEEPCNT: conf.cache.socket_keepalive_count socket.TCP_KEEPCNT: conf.cache.socket_keepalive_count
} }
conf_dict.setdefault( conf_dict.setdefault(
'%s.arguments.connection_kwargs' % prefix, {} f'{prefix}.arguments.connection_kwargs', {}
).update({ ).update({
'socket_keepalive': True, 'socket_keepalive': True,
'socket_keepalive_options': socket_keepalive_options 'socket_keepalive_options': socket_keepalive_options
@@ -346,16 +346,16 @@ def _build_cache_config(conf):
) )
raise exception.ConfigurationError(msg) raise exception.ConfigurationError(msg)
import pymemcache import pymemcache
conf_dict['%s.arguments.enable_retry_client' % prefix] = True conf_dict[f'{prefix}.arguments.enable_retry_client'] = True
conf_dict['%s.arguments.retry_attempts' % prefix] = \ conf_dict[f'{prefix}.arguments.retry_attempts'] = \
conf.cache.retry_attempts conf.cache.retry_attempts
conf_dict['%s.arguments.retry_delay' % prefix] = \ conf_dict[f'{prefix}.arguments.retry_delay'] = \
conf.cache.retry_delay conf.cache.retry_delay
conf_dict['%s.arguments.hashclient_retry_attempts' % prefix] = \ conf_dict[f'{prefix}.arguments.hashclient_retry_attempts'] = \
conf.cache.hashclient_retry_attempts conf.cache.hashclient_retry_attempts
conf_dict['%s.arguments.hashclient_retry_delay' % prefix] = \ conf_dict[f'{prefix}.arguments.hashclient_retry_delay'] = \
conf.cache.hashclient_retry_delay conf.cache.hashclient_retry_delay
conf_dict['%s.arguments.dead_timeout' % prefix] = \ conf_dict[f'{prefix}.arguments.dead_timeout'] = \
conf.cache.dead_timeout conf.cache.dead_timeout
return conf_dict return conf_dict
@@ -445,7 +445,7 @@ def configure_cache_region(conf, region):
config_dict = _build_cache_config(conf) config_dict = _build_cache_config(conf)
region.configure_from_config(config_dict, region.configure_from_config(config_dict,
'%s.' % conf.cache.config_prefix) f'{conf.cache.config_prefix}.')
if conf.cache.debug_cache_backend: if conf.cache.debug_cache_backend:
region.wrap(_DebugProxy) region.wrap(_DebugProxy)