Skip to content

Commit 858e63d

Browse files
committed
Remove django-redis dependency
1 parent 6fe54e9 commit 858e63d

File tree

4 files changed

+3
-33
lines changed

4 files changed

+3
-33
lines changed

django_prometheus/cache/backends/redis.py

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from django.core.cache.backends.redis import RedisCache as DjangoRedisCache
2-
from django_redis import cache, exceptions
32

43
from django_prometheus.cache.metrics import (
54
django_cache_get_fail_total,
@@ -9,30 +8,6 @@
98
)
109

1110

12-
class RedisCache(cache.RedisCache):
13-
"""Inherit redis to add metrics about hit/miss/interruption ratio"""
14-
15-
@cache.omit_exception
16-
def get(self, key, default=None, version=None, client=None):
17-
try:
18-
django_cache_get_total.labels(backend="redis").inc()
19-
cached = self.client.get(key, default=None, version=version, client=client)
20-
except exceptions.ConnectionInterrupted as e:
21-
django_cache_get_fail_total.labels(backend="redis").inc()
22-
if self._ignore_exceptions:
23-
if self._log_ignored_exceptions:
24-
cache.logger.error(str(e))
25-
return default
26-
raise
27-
else:
28-
if cached is not None:
29-
django_cache_hits_total.labels(backend="redis").inc()
30-
return cached
31-
else:
32-
django_cache_misses_total.labels(backend="redis").inc()
33-
return default
34-
35-
3611
class NativeRedisCache(DjangoRedisCache):
3712
def get(self, key, default=None, version=None):
3813
django_cache_get_total.labels(backend="native_redis").inc()

django_prometheus/tests/end2end/testapp/settings.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,17 +123,13 @@
123123
"BACKEND": "django_prometheus.cache.backends.redis.NativeRedisCache",
124124
"LOCATION": "redis://127.0.0.1:6379/0",
125125
},
126-
"redis": {
127-
"BACKEND": "django_prometheus.cache.backends.redis.RedisCache",
128-
"LOCATION": "redis://127.0.0.1:6379/1",
129-
},
130126
# Fake redis config emulated stopped service
131127
"stopped_redis": {
132-
"BACKEND": "django_prometheus.cache.backends.redis.RedisCache",
128+
"BACKEND": "django_prometheus.cache.backends.redis.NativeRedisCache",
133129
"LOCATION": "redis://127.0.0.1:6666/1",
134130
},
135131
"stopped_redis_ignore_exception": {
136-
"BACKEND": "django_prometheus.cache.backends.redis.RedisCache",
132+
"BACKEND": "django_prometheus.cache.backends.redis.NativeRedisCache",
137133
"LOCATION": "redis://127.0.0.1:6666/1",
138134
"OPTIONS": {"IGNORE_EXCEPTIONS": True},
139135
},

django_prometheus/tests/end2end/testapp/test_caches.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"filebased",
1111
"locmem",
1212
"native_redis",
13-
"redis",
1413
]
1514

1615

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
django-redis>=4.12.1
21
prometheus-client>=0.12.0
32
pip-prometheus>=1.2.1
43
mysqlclient
@@ -9,4 +8,5 @@ pylibmc
98
pymemcache
109
python-memcached
1110
setuptools<72.0.0
11+
redis
1212
wheel

0 commit comments

Comments
 (0)