kopia lustrzana https://dev.funkwhale.audio/funkwhale/funkwhale
fix(api): prefer str over dict for the CACHE_URL setting
This fix the ability to reuse the CACHE_URL with other settings such as CELERY_BROKER_URL.environments/review-docs-nginx-aqlin2/deployments/17397
rodzic
ca3106828d
commit
3028672096
|
@ -737,7 +737,6 @@ See :doc:`/administrator_documentation/configuration_docs/ldap` for more informa
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if AUTH_LDAP_ENABLED:
|
if AUTH_LDAP_ENABLED:
|
||||||
|
|
||||||
# Import the LDAP modules here.
|
# Import the LDAP modules here.
|
||||||
# This way, we don't need the dependency unless someone
|
# This way, we don't need the dependency unless someone
|
||||||
# actually enables the LDAP support
|
# actually enables the LDAP support
|
||||||
|
@ -809,7 +808,7 @@ CACHE_URL_DEFAULT = "redis://127.0.0.1:6379/0"
|
||||||
if IS_DOCKER_SETUP:
|
if IS_DOCKER_SETUP:
|
||||||
CACHE_URL_DEFAULT = "redis://redis:6379/0"
|
CACHE_URL_DEFAULT = "redis://redis:6379/0"
|
||||||
|
|
||||||
CACHE_URL = env.cache_url("CACHE_URL", default=CACHE_URL_DEFAULT)
|
CACHE_URL = env.str("CACHE_URL", default=CACHE_URL_DEFAULT)
|
||||||
"""
|
"""
|
||||||
The URL of your redis server. For example:
|
The URL of your redis server. For example:
|
||||||
|
|
||||||
|
@ -828,13 +827,20 @@ If you're using password auth (the extra slash is important)
|
||||||
|
|
||||||
"""
|
"""
|
||||||
CACHES = {
|
CACHES = {
|
||||||
"default": CACHE_URL,
|
"default": {
|
||||||
|
"BACKEND": "django_redis.cache.RedisCache",
|
||||||
|
"LOCATION": CACHE_URL,
|
||||||
|
"OPTIONS": {
|
||||||
|
"CLIENT_CLASS": "funkwhale_api.common.cache.RedisClient",
|
||||||
|
"IGNORE_EXCEPTIONS": True, # mimics memcache behavior.
|
||||||
|
# http://niwinz.github.io/django-redis/latest/#_memcached_exceptions_behavior
|
||||||
|
},
|
||||||
|
},
|
||||||
"local": {
|
"local": {
|
||||||
"BACKEND": "django.core.cache.backends.locmem.LocMemCache",
|
"BACKEND": "django.core.cache.backends.locmem.LocMemCache",
|
||||||
"LOCATION": "local-cache",
|
"LOCATION": "local-cache",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
CACHES["default"]["BACKEND"] = "django_redis.cache.RedisCache"
|
|
||||||
|
|
||||||
CHANNEL_LAYERS = {
|
CHANNEL_LAYERS = {
|
||||||
"default": {
|
"default": {
|
||||||
|
@ -843,11 +849,6 @@ CHANNEL_LAYERS = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CACHES["default"]["OPTIONS"] = {
|
|
||||||
"CLIENT_CLASS": "funkwhale_api.common.cache.RedisClient",
|
|
||||||
"IGNORE_EXCEPTIONS": True, # mimics memcache behavior.
|
|
||||||
# http://niwinz.github.io/django-redis/latest/#_memcached_exceptions_behavior
|
|
||||||
}
|
|
||||||
CACHEOPS_DURATION = env("CACHEOPS_DURATION", default=0)
|
CACHEOPS_DURATION = env("CACHEOPS_DURATION", default=0)
|
||||||
CACHEOPS_ENABLED = bool(CACHEOPS_DURATION)
|
CACHEOPS_ENABLED = bool(CACHEOPS_DURATION)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
Prefer str over dict for the CACHE_URL api setting
|
||||||
|
|
||||||
|
This fix the ability to reuse the CACHE_URL with other settings such as
|
||||||
|
CELERY_BROKER_URL.
|
Ładowanie…
Reference in New Issue