From 5c6291b407790b0beb615a6740a4e2db3f3091b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20M=C3=A4der?= Date: Sat, 17 Oct 2020 18:24:11 +0200 Subject: [PATCH] Remove legacy Redis settings --- configuration/configuration.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/configuration/configuration.py b/configuration/configuration.py index 404b6a0..e739682 100644 --- a/configuration/configuration.py +++ b/configuration/configuration.py @@ -56,15 +56,7 @@ REDIS = { 'PORT': int(os.environ.get('REDIS_PORT', 6379)), 'PASSWORD': os.environ.get('REDIS_PASSWORD', read_secret('redis_password')), 'DATABASE': int(os.environ.get('REDIS_DATABASE', 0)), - 'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_TIMEOUT', 300)), - 'SSL': os.environ.get('REDIS_SSL', 'False').lower() == 'true', - }, - 'webhooks': { # legacy setting, can be removed after Netbox seizes support for it - 'HOST': os.environ.get('REDIS_HOST', 'localhost'), - 'PORT': int(os.environ.get('REDIS_PORT', 6379)), - 'PASSWORD': os.environ.get('REDIS_PASSWORD', read_secret('redis_password')), - 'DATABASE': int(os.environ.get('REDIS_DATABASE', 0)), - 'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_TIMEOUT', 300)), + 'RQ_DEFAULT_TIMEOUT': int(os.environ.get('REDIS_TIMEOUT', 300)), 'SSL': os.environ.get('REDIS_SSL', 'False').lower() == 'true', }, 'caching': { @@ -72,7 +64,7 @@ REDIS = { 'PORT': int(os.environ.get('REDIS_CACHE_PORT', os.environ.get('REDIS_PORT', 6379))), 'PASSWORD': os.environ.get('REDIS_CACHE_PASSWORD', os.environ.get('REDIS_PASSWORD', read_secret('redis_cache_password'))), 'DATABASE': int(os.environ.get('REDIS_CACHE_DATABASE', 1)), - 'DEFAULT_TIMEOUT': int(os.environ.get('REDIS_CACHE_TIMEOUT', os.environ.get('REDIS_TIMEOUT', 300))), + 'RQ_DEFAULT_TIMEOUT': int(os.environ.get('REDIS_CACHE_TIMEOUT', os.environ.get('REDIS_TIMEOUT', 300))), 'SSL': os.environ.get('REDIS_CACHE_SSL', os.environ.get('REDIS_SSL', 'False')).lower() == 'true', }, }