diff --git a/docs/release-notes/version-3.3.md b/docs/release-notes/version-3.3.md index c86317d26..ee3e7cddf 100644 --- a/docs/release-notes/version-3.3.md +++ b/docs/release-notes/version-3.3.md @@ -17,6 +17,7 @@ * [#11101](https://github.com/netbox-community/netbox/issues/11101) - Correct circuits count under site view * [#11128](https://github.com/netbox-community/netbox/issues/11128) - Disable ordering changelog table by object to avoid exception * [#11142](https://github.com/netbox-community/netbox/issues/11142) - Correct available choices for status under IP range filter form +* [#11168](https://github.com/netbox-community/netbox/issues/11168) - Honor `RQ_DEFAULT_TIMEOUT` config parameter when using Redis Sentinel --- diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 663da3b32..5c0f486f3 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -626,8 +626,6 @@ if TASKS_REDIS_USING_SENTINEL: RQ_PARAMS = { 'SENTINELS': TASKS_REDIS_SENTINELS, 'MASTER_NAME': TASKS_REDIS_SENTINEL_SERVICE, - 'DB': TASKS_REDIS_DATABASE, - 'PASSWORD': TASKS_REDIS_PASSWORD, 'SOCKET_TIMEOUT': None, 'CONNECTION_KWARGS': { 'socket_connect_timeout': TASKS_REDIS_SENTINEL_TIMEOUT @@ -637,12 +635,14 @@ else: RQ_PARAMS = { 'HOST': TASKS_REDIS_HOST, 'PORT': TASKS_REDIS_PORT, - 'DB': TASKS_REDIS_DATABASE, - 'PASSWORD': TASKS_REDIS_PASSWORD, 'SSL': TASKS_REDIS_SSL, 'SSL_CERT_REQS': None if TASKS_REDIS_SKIP_TLS_VERIFY else 'required', - 'DEFAULT_TIMEOUT': RQ_DEFAULT_TIMEOUT, } +RQ_PARAMS.update({ + 'DB': TASKS_REDIS_DATABASE, + 'PASSWORD': TASKS_REDIS_PASSWORD, + 'DEFAULT_TIMEOUT': RQ_DEFAULT_TIMEOUT, +}) RQ_QUEUES = { 'high': RQ_PARAMS,