p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #27480 -- Moved FileBasedCache content writing logic to a method.

This commit is contained in:
Simon Charette 2018-07-08 19:34:04 -04:00 committed by Tim Graham
parent 5bea8d256d
commit 2d75509bcb
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
django/core/cache/backends/filebased.py vendored
View File

@ -13,11 +13,6 @@ from django.core.files import locks
from django.core.files.move import file_move_safe from django.core.files.move import file_move_safe
def _write_content(f, expiry, value):
f.write(pickle.dumps(expiry, pickle.HIGHEST_PROTOCOL))
f.write(zlib.compress(pickle.dumps(value, pickle.HIGHEST_PROTOCOL)))
class FileBasedCache(BaseCache): class FileBasedCache(BaseCache):
cache_suffix = '.djcache' cache_suffix = '.djcache'
@ -42,6 +37,11 @@ class FileBasedCache(BaseCache):
pass pass
return default return default
def _write_content(self, file, timeout, value):
expiry = self.get_backend_timeout(timeout)
file.write(pickle.dumps(expiry, pickle.HIGHEST_PROTOCOL))
file.write(zlib.compress(pickle.dumps(value, pickle.HIGHEST_PROTOCOL)))
def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None): def set(self, key, value, timeout=DEFAULT_TIMEOUT, version=None):
self._createdir() # Cache dir can be deleted at any time. self._createdir() # Cache dir can be deleted at any time.
fname = self._key_to_file(key, version) fname = self._key_to_file(key, version)
@ -50,8 +50,7 @@ class FileBasedCache(BaseCache):
renamed = False renamed = False
try: try:
with open(fd, 'wb') as f: with open(fd, 'wb') as f:
expiry = self.get_backend_timeout(timeout) self._write_content(f, timeout, value)
_write_content(f, expiry, value)
file_move_safe(tmp_path, fname, allow_overwrite=True) file_move_safe(tmp_path, fname, allow_overwrite=True)
renamed = True renamed = True
finally: finally:
@ -68,7 +67,7 @@ class FileBasedCache(BaseCache):
else: else:
previous_value = pickle.loads(zlib.decompress(f.read())) previous_value = pickle.loads(zlib.decompress(f.read()))
f.seek(0) f.seek(0)
_write_content(f, self.get_backend_timeout(timeout), previous_value) self._write_content(f, timeout, previous_value)
return True return True
finally: finally:
locks.unlock(f) locks.unlock(f)