inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 12:06:44 +00:00
Code

Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2250

Browse Source
This commit is contained in:
Matthias 2021-12-07 01:16:32 +01:00
commit 2cf4e20d9a
No known key found for this signature in database
GPG Key ID: F50EF5741D33E076
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
InvenTree/InvenTree/settings.py
View File

@ -583,7 +583,7 @@ _cache_port = _cache_config.get(
if _cache_host: if _cache_host:
# We are going to rely upon a possibly non-localhost for our cache, # We are going to rely upon a possibly non-localhost for our cache,
# so don't wait too long for the cache as nothing in the cache should be # so don't wait too long for the cache as nothing in the cache should be
# irreplacable. Django Q Cluster will just try again later. # irreplacable.
_cache_options = { _cache_options = {
"CLIENT_CLASS": "django_redis.client.DefaultClient", "CLIENT_CLASS": "django_redis.client.DefaultClient",
"SOCKET_CONNECT_TIMEOUT": int(os.getenv("CACHE_CONNECT_TIMEOUT", "2")), "SOCKET_CONNECT_TIMEOUT": int(os.getenv("CACHE_CONNECT_TIMEOUT", "2")),
@ -609,15 +609,9 @@ if _cache_host:
}, },
} }
CACHES = { CACHES = {
# Connection configuration for Django Q Cluster
"worker": {
"BACKEND": "django_redis.cache.RedisCache",
"LOCATION": f"redis://{_cache_host}:{_cache_port}/0",
"OPTIONS": _cache_options,
},
"default": { "default": {
"BACKEND": "django_redis.cache.RedisCache", "BACKEND": "django_redis.cache.RedisCache",
"LOCATION": f"redis://{_cache_host}:{_cache_port}/1", "LOCATION": f"redis://{_cache_host}:{_cache_port}/0",
"OPTIONS": _cache_options, "OPTIONS": _cache_options,
}, },
} }