add env variable for cache service connection

Hexlet · Oct 18, 2024 · 44d96f0 · 44d96f0
1 parent ba33747
commit 44d96f0
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 4 deletions.
diff --git a/.env.example b/.env.example
@@ -17,3 +17,6 @@ POSTGRES_HOST=
 POSTGRES_PORT=
 SENTRY_DSN=
 DJANGO_SUPERUSER_PASSWORD='admin'
+CACHE_LOCATION='memcached:11211'
+CACHE_USERNAME=
+CACHE_PASSWORD=
diff --git a/config/settings.py b/config/settings.py
@@ -272,8 +272,12 @@
 
 CACHES = {
     'default': {
-        'BACKEND': 'django.core.cache.backends.memcached.PyMemcacheCache',
-        'LOCATION': 'memcached:11211',
+        'BACKEND': 'django_bmemcached.memcached.BMemcached',
+        'LOCATION': os.environ.get('CACHE_LOCATION', '').split(','),
+        'OPTIONS': {
+            'username': os.environ.get('CACHE_USERNAME', ''),
+            'password': os.environ.get('CACHE_PASSWORD', '')
+        }
     }
 }
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
 
     ports:
       - 5433:5432
-  
+
   memcached:
     image: memcached:alpine
     ports:
@@ -25,6 +25,9 @@ services:
       POSTGRES_HOST: db
       POSTGRES_USER: postgres
       POSTGRES_DB: postgres
+      CACHE_LOCATION: memcached
+      CACHE_USERNAME:
+      CACHE_PASSWORD:
     volumes:
       - .:/usr/local/src/hexlet-friends
     ports:

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,6 +29,7 @@ django-mathfilters = "^1.0.0"
 django-filter = "^23.2"
 sentry-sdk = "^1.29.2"
 pymemcache = "^4.0.0"
+django-bmemcached = "^0.3.0"
 
 [tool.poetry.group.dev.dependencies]
 Faker = "^13.15.1"