From b295c22b34318ca506bb69d41b4aff21a1682a05 Mon Sep 17 00:00:00 2001 From: Giovanni Allegri Date: Thu, 4 Apr 2024 14:44:10 +0200 Subject: [PATCH] Switch to PyLibMCCache (#12132) --- .devcontainer/.env | 2 +- .env.sample | 2 +- .env_dev | 2 +- .env_local | 2 +- .env_test | 2 +- geonode/settings.py | 2 +- requirements.txt | 1 - setup.cfg | 1 - 8 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.devcontainer/.env b/.devcontainer/.env index 2713c3db517..98923e8ed11 100644 --- a/.devcontainer/.env +++ b/.devcontainer/.env @@ -166,7 +166,7 @@ SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a' CACHE_BUSTING_STATIC_ENABLED=False MEMCACHED_ENABLED=False -MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache +MEMCACHED_BACKEND=django.core.cache.backends.memcached.PyLibMCCache MEMCACHED_LOCATION=127.0.0.1:11211 MEMCACHED_LOCK_EXPIRE=3600 MEMCACHED_LOCK_TIMEOUT=10 diff --git a/.env.sample b/.env.sample index 6f51754db13..2ec4a7b8c9a 100644 --- a/.env.sample +++ b/.env.sample @@ -173,7 +173,7 @@ GEOIP_PATH=/mnt/volumes/statics/geoip.db CACHE_BUSTING_STATIC_ENABLED=False MEMCACHED_ENABLED=False -MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache +MEMCACHED_BACKEND=django.core.cache.backends.memcached.PyLibMCCache MEMCACHED_LOCATION=memcached:11211 MEMCACHED_LOCK_EXPIRE=3600 MEMCACHED_LOCK_TIMEOUT=10 diff --git a/.env_dev b/.env_dev index 0b81ed6529d..34f85b41da6 100644 --- a/.env_dev +++ b/.env_dev @@ -173,7 +173,7 @@ SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a' CACHE_BUSTING_STATIC_ENABLED=False MEMCACHED_ENABLED=False -MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache +MEMCACHED_BACKEND=django.core.cache.backends.memcached.PyLibMCCache MEMCACHED_LOCATION=127.0.0.1:11211 MEMCACHED_LOCK_EXPIRE=3600 MEMCACHED_LOCK_TIMEOUT=10 diff --git a/.env_local b/.env_local index ce456cf8641..3045a3eca17 100644 --- a/.env_local +++ b/.env_local @@ -173,7 +173,7 @@ SECRET_KEY='myv-y4#7j-d*p-__@j#*3z@!y24fz8%^z2v6atuy4bo9vqr1_a' CACHE_BUSTING_STATIC_ENABLED=False MEMCACHED_ENABLED=False -MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache +MEMCACHED_BACKEND=django.core.cache.backends.memcached.PyLibMCCache MEMCACHED_LOCATION=127.0.0.1:11211 MEMCACHED_LOCK_EXPIRE=3600 MEMCACHED_LOCK_TIMEOUT=10 diff --git a/.env_test b/.env_test index 6dcbc35ccc5..8026c6c0002 100644 --- a/.env_test +++ b/.env_test @@ -182,7 +182,7 @@ GEOIP_PATH=/mnt/volumes/statics/geoip.db CACHE_BUSTING_STATIC_ENABLED=False MEMCACHED_ENABLED=False -MEMCACHED_BACKEND=django.core.cache.backends.memcached.MemcachedCache +MEMCACHED_BACKEND=django.core.cache.backends.memcached.PyLibMCCache MEMCACHED_LOCATION=memcached:11211 MEMCACHED_LOCK_EXPIRE=3600 MEMCACHED_LOCK_TIMEOUT=10 diff --git a/geonode/settings.py b/geonode/settings.py index c1832968c72..2da7b84278a 100644 --- a/geonode/settings.py +++ b/geonode/settings.py @@ -371,7 +371,7 @@ COMPRESS_STATIC_FILES = ast.literal_eval(os.getenv("COMPRESS_STATIC_FILES", "False")) MEMCACHED_ENABLED = ast.literal_eval(os.getenv("MEMCACHED_ENABLED", "False")) -MEMCACHED_BACKEND = os.getenv("MEMCACHED_BACKEND", "django.core.cache.backends.memcached.PyMemcacheCache") +MEMCACHED_BACKEND = os.getenv("MEMCACHED_BACKEND", "django.core.cache.backends.memcached.PyLibMCCache") MEMCACHED_LOCATION = os.getenv("MEMCACHED_LOCATION", "127.0.0.1:11211") MEMCACHED_LOCK_EXPIRE = int(os.getenv("MEMCACHED_LOCK_EXPIRE", 3600)) MEMCACHED_LOCK_TIMEOUT = int(os.getenv("MEMCACHED_LOCK_TIMEOUT", 10)) diff --git a/requirements.txt b/requirements.txt index 5247fe5aeec..a055e013e46 100644 --- a/requirements.txt +++ b/requirements.txt @@ -109,7 +109,6 @@ google-cloud-core==2.4.1 boto3==1.34.74 # Django Caches -python-memcached<=1.62 whitenoise==6.6.0 Brotli==1.1.0 diff --git a/setup.cfg b/setup.cfg index 22909bca0aa..8deca0fd75e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -134,7 +134,6 @@ install_requires = boto3==1.34.74 # Django Caches - python-memcached<=1.62 whitenoise==6.6.0 Brotli==1.1.0