Merge pull request #7200 from pierrechev/develop

jeremystretch · web-flow · commit 2ba840c72c31 · 2021-09-07T16:58:11.000-04:00
Enable the alternate connection factory for Redis Sentinel
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
@@ -250,6 +250,7 @@ def _setting(name, default=None):
     }
 }
 if CACHING_REDIS_SENTINELS:
+    DJANGO_REDIS_CONNECTION_FACTORY = 'django_redis.pool.SentinelConnectionFactory'
     CACHES['default']['LOCATION'] = f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_SENTINEL_SERVICE}/{CACHING_REDIS_DATABASE}'
     CACHES['default']['OPTIONS']['CLIENT_CLASS'] = 'django_redis.client.SentinelClient'
     CACHES['default']['OPTIONS']['SENTINELS'] = CACHING_REDIS_SENTINELS

Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,7 @@ def _setting(name, default=None):`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`	`if CACHING_REDIS_SENTINELS:`
	`253`	`+ DJANGO_REDIS_CONNECTION_FACTORY = 'django_redis.pool.SentinelConnectionFactory'`
`253`	`254`	`CACHES['default']['LOCATION'] = f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_SENTINEL_SERVICE}/{CACHING_REDIS_DATABASE}'`
`254`	`255`	`CACHES['default']['OPTIONS']['CLIENT_CLASS'] = 'django_redis.client.SentinelClient'`
`255`	`256`	`CACHES['default']['OPTIONS']['SENTINELS'] = CACHING_REDIS_SENTINELS`