Skip to content
Snippets Groups Projects
Commit fa97cb57 authored by Erik Reid's avatar Erik Reid
Browse files

socket timeouts are global, not transport options

... apparently?
parent de316e64
Branches
Tags
No related merge requests found
......@@ -4,6 +4,8 @@ from inventory_provider import config
logger = logging.getLogger(__name__)
DEFAULT_CELERY_DB_INDEX = 1
DEFAULT_SENTINEL_SOCKET_TIMEOUT = 0.5
DEFAULT_REDIS_SOCKET_TIMEOUT = 5.0
assert os.path.isfile(os.environ['INVENTORY_PROVIDER_CONFIG_FILENAME']), (
'config file %r not found' %
......@@ -21,16 +23,14 @@ if 'sentinel' in inventory_provider_config:
params = inventory_provider_config['sentinel']
_broker_scheme = 'sentinel'
broker_transport_options['master_name'] = params['name']
if 'sentinel_socket_timeout' in params:
broker_transport_options['sentinel_socket_timeout'] \
= params['sentinel_socket_timeout']
sentinel_socket_timeout = params.get(
'sentinel_socket_timeout', DEFAULT_SENTINEL_SOCKET_TIMEOUT)
else:
params = inventory_provider_config['redis']
_broker_scheme = 'redis'
if 'redis_socket_timeout' in params:
broker_transport_options['redis_socket_timeout'] \
= params['redis_socket_timeout']
redis_socket_timeout = params.get(
'redis_socket_timeout', DEFAULT_REDIS_SOCKET_TIMEOUT)
_broker_hostname = params['hostname']
_broker_port = params['port']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment