openstack/oslo.cache
Code Issues Proposed changes

Use oslo.utils implementation to parse sentinel address

Browse Source 
... instead of maintaining own logic.

Change-Id: Icda2a6ebfe779b35fa606cd6cd27ce18d47fe147
This commit is contained in:
Takashi Kajinami 2024-10-01 17:01:18 +09:00
parent 48dbe7808f
commit 2897ee8710
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
oslo_cache/core.py
View File

@ -34,7 +34,6 @@ The library has special public value for nonexistent or expired keys called
from oslo_cache import core from oslo_cache import core
NO_VALUE = core.NO_VALUE NO_VALUE = core.NO_VALUE
""" """
import re
import socket import socket
import ssl import ssl
import urllib.parse import urllib.parse
@ -45,6 +44,7 @@ from dogpile.cache import proxy
from dogpile.cache import util from dogpile.cache import util
from oslo_log import log from oslo_log import log
from oslo_utils import importutils from oslo_utils import importutils
from oslo_utils import netutils
from oslo_cache._i18n import _ from oslo_cache._i18n import _
from oslo_cache import _opts from oslo_cache import _opts
@ -104,15 +104,10 @@ class _DebugProxy(proxy.ProxyBackend):
def _parse_sentinel(sentinel): def _parse_sentinel(sentinel):
# IPv6 (eg. [::1]:6379 ) host, port = netutils.parse_host_port(sentinel)
match = re.search(r'^\[(\S+)\]:(\d+)$', sentinel) if host is None or port is None:
if match: raise exception.ConfigurationError('Malformed sentinel server format')
return (match[1], int(match[2])) return (host, port)
# IPv4 or hostname (eg. 127.0.0.1:6379 or localhost:6379)
match = re.search(r'^(\S+):(\d+)$', sentinel)
if match:
return (match[1], int(match[2]))
raise exception.ConfigurationError('Malformed sentinel server format')
def _build_cache_config(conf): def _build_cache_config(conf):