From fa97cb5719a7da1c0d0be8af61a1f284e0583ff4 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Fri, 8 May 2020 10:08:54 +0200
Subject: [PATCH] socket timeouts are global, not transport options
... apparently?
---
inventory_provider/tasks/config.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/inventory_provider/tasks/config.py b/inventory_provider/tasks/config.py
index 2026f9a6..694c6e61 100644
--- a/inventory_provider/tasks/config.py
+++ b/inventory_provider/tasks/config.py
@@ -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']
--
GitLab