Skip to content

Commit 115bc36

Browse files
TheOldMopkorfuri
authored andcommitted
fix returning default value for cache's (#78)
1 parent 62c2b31 commit 115bc36

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

django_prometheus/cache/backends/django_memcached_consul.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ def get(self, key, default=None, version=None):
1717
else:
1818
django_cache_misses_total.labels(
1919
backend='django_memcached_consul').inc()
20-
return cached
20+
return cached or default

django_prometheus/cache/backends/filebased.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ def get(self, key, default=None, version=None):
1414
django_cache_hits_total.labels(backend='filebased').inc()
1515
else:
1616
django_cache_misses_total.labels(backend='filebased').inc()
17-
return cached
17+
return cached or default

django_prometheus/cache/backends/locmem.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ def get(self, key, default=None, version=None):
1414
django_cache_hits_total.labels(backend='locmem').inc()
1515
else:
1616
django_cache_misses_total.labels(backend='locmem').inc()
17-
return cached
17+
return cached or default

django_prometheus/cache/backends/memcached.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ def get(self, key, default=None, version=None):
1616
else:
1717
django_cache_misses_total.labels(
1818
backend='memcached').inc()
19-
return cached
19+
return cached or default

django_prometheus/tests/end2end/testapp/test_caches.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,13 @@ def testCounters(self):
2020
tested_cache.get('foo1')
2121
tested_cache.get('foofoo')
2222

23+
result = tested_cache.get('foofoo', default='default')
24+
25+
assert result == 'default'
26+
2327
self.assertMetricEquals(
24-
3, 'django_cache_get_total', backend=supported_cache)
28+
4, 'django_cache_get_total', backend=supported_cache)
2529
self.assertMetricEquals(
2630
2, 'django_cache_get_hits_total', backend=supported_cache)
2731
self.assertMetricEquals(
28-
1, 'django_cache_get_misses_total', backend=supported_cache)
32+
2, 'django_cache_get_misses_total', backend=supported_cache)

0 commit comments

Comments
 (0)