Switch to PyLibMCCache

GeoNode · Apr 4, 2024 · e4b5137 · e4b5137
1 parent 310d9ef
commit e4b5137
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -134,7 +134,6 @@ install_requires =
     boto3==1.34.74
 
     # Django Caches
-    python-memcached<=1.62
     whitenoise==6.6.0
     Brotli==1.1.0