Skip to content

fix(cache): clear expired entries safely #961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mr-Neutr0n wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −3
Open

fix(cache): clear expired entries safely #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions cache/local_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,13 @@ def _clear(self):
Clean up cache based on expiration time
:return:
"""
for key, (value, expire_time) in self._cache_container.items():
if expire_time < time.time():
del self._cache_container[key]
expired_keys = [
key
for key, (_, expire_time) in self._cache_container.items()
if expire_time < time.time()
]
for key in expired_keys:
del self._cache_container[key]

async def _start_clear_cron(self):
"""
Expand Down
8 changes: 8 additions & 0 deletions test/test_expiring_local_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@ def test_clear(self):
time.sleep(12)
self.assertIsNone(self.cache.get('key'))

def test_clear_removes_multiple_expired_keys(self):
self.cache.set('first', 'value', 0)
self.cache.set('second', 'value', 0)

self.cache._clear()

self.assertEqual(self.cache.keys('*'), [])

def tearDown(self):
del self.cache

Expand Down