From 8e3757db279b2ed04de7eb02b370e41131424312 Mon Sep 17 00:00:00 2001 From: Yury Kurzhumov Date: Sun, 26 Sep 2021 22:23:57 +0500 Subject: [PATCH] Fix cache backends --- .../cache/backends/django_memcached_consul.py | 7 ++++--- django_prometheus/cache/backends/filebased.py | 7 ++++--- django_prometheus/cache/backends/locmem.py | 7 ++++--- django_prometheus/cache/backends/memcached.py | 7 ++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/django_prometheus/cache/backends/django_memcached_consul.py b/django_prometheus/cache/backends/django_memcached_consul.py index 678b5794..ffbe7abb 100644 --- a/django_prometheus/cache/backends/django_memcached_consul.py +++ b/django_prometheus/cache/backends/django_memcached_consul.py @@ -14,6 +14,7 @@ def get(self, key, default=None, version=None): cached = super().get(key, default=None, version=version) if cached is not None: django_cache_hits_total.labels(backend="django_memcached_consul").inc() - else: - django_cache_misses_total.labels(backend="django_memcached_consul").inc() - return cached or default + return cached + + django_cache_misses_total.labels(backend="django_memcached_consul").inc() + return default diff --git a/django_prometheus/cache/backends/filebased.py b/django_prometheus/cache/backends/filebased.py index 1fc56b2d..7d38f793 100644 --- a/django_prometheus/cache/backends/filebased.py +++ b/django_prometheus/cache/backends/filebased.py @@ -14,6 +14,7 @@ def get(self, key, default=None, version=None): cached = super().get(key, default=None, version=version) if cached is not None: django_cache_hits_total.labels(backend="filebased").inc() - else: - django_cache_misses_total.labels(backend="filebased").inc() - return cached or default + return cached + + django_cache_misses_total.labels(backend="filebased").inc() + return default diff --git a/django_prometheus/cache/backends/locmem.py b/django_prometheus/cache/backends/locmem.py index c4f73d8a..f4750271 100644 --- a/django_prometheus/cache/backends/locmem.py +++ b/django_prometheus/cache/backends/locmem.py @@ -14,6 +14,7 @@ def get(self, key, default=None, version=None): cached = super().get(key, default=None, version=version) if cached is not None: django_cache_hits_total.labels(backend="locmem").inc() - else: - django_cache_misses_total.labels(backend="locmem").inc() - return cached or default + return cached + + django_cache_misses_total.labels(backend="locmem").inc() + return default diff --git a/django_prometheus/cache/backends/memcached.py b/django_prometheus/cache/backends/memcached.py index 8a405ed2..06bd7e1e 100644 --- a/django_prometheus/cache/backends/memcached.py +++ b/django_prometheus/cache/backends/memcached.py @@ -14,6 +14,7 @@ def get(self, key, default=None, version=None): cached = super().get(key, default=None, version=version) if cached is not None: django_cache_hits_total.labels(backend="memcached").inc() - else: - django_cache_misses_total.labels(backend="memcached").inc() - return cached or default + return cached + + django_cache_misses_total.labels(backend="memcached").inc() + return default