summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAlex Hill <alex@hill.net.au>2016-03-09 11:35:39 +0800
committerTim Graham <timograham@gmail.com>2016-03-16 12:37:57 -0400
commitecb59cc6579402b68ddfd4499bf30edacf5963be (patch)
tree05c9af211caaf5a0de6576f2c9fb77f1d898a3cb /django
parent460dab0b40cc072873893feb5dd6820fa0ee9e9d (diff)
Fixed #26306 -- Fixed memory leak in cached template loader.
Diffstat (limited to 'django')
-rw-r--r--django/template/backends/django.py17
-rw-r--r--django/template/loaders/cached.py27
2 files changed, 38 insertions, 6 deletions
diff --git a/django/template/backends/django.py b/django/template/backends/django.py
index cc795aae1c..afe1a7cd23 100644
--- a/django/template/backends/django.py
+++ b/django/template/backends/django.py
@@ -68,13 +68,24 @@ class Template(object):
reraise(exc, self.backend)
-def reraise(exc, backend):
+def copy_exception(exc, backend=None):
"""
- Reraise TemplateDoesNotExist while maintaining template debug information.
+ Create a new TemplateDoesNotExist. Preserve its declared attributes and
+ template debug data but discard __traceback__, __context__, and __cause__
+ to make this object suitable for keeping around (in a cache, for example).
"""
- new = exc.__class__(*exc.args, tried=exc.tried, backend=backend)
+ backend = backend or exc.backend
+ new = exc.__class__(*exc.args, tried=exc.tried, backend=backend, chain=exc.chain)
if hasattr(exc, 'template_debug'):
new.template_debug = exc.template_debug
+ return new
+
+
+def reraise(exc, backend):
+ """
+ Reraise TemplateDoesNotExist while maintaining template debug information.
+ """
+ new = copy_exception(exc, backend)
six.reraise(exc.__class__, new, sys.exc_info()[2])
diff --git a/django/template/loaders/cached.py b/django/template/loaders/cached.py
index 5bf5c10586..70c55feb51 100644
--- a/django/template/loaders/cached.py
+++ b/django/template/loaders/cached.py
@@ -7,6 +7,7 @@ import hashlib
import warnings
from django.template import Origin, Template, TemplateDoesNotExist
+from django.template.backends.django import copy_exception
from django.utils.deprecation import RemovedInDjango20Warning
from django.utils.encoding import force_bytes
from django.utils.inspect import func_supports_parameter
@@ -27,11 +28,31 @@ class Loader(BaseLoader):
return origin.loader.get_contents(origin)
def get_template(self, template_name, template_dirs=None, skip=None):
+ """
+ Perform the caching that gives this loader its name. Often many of the
+ templates attempted will be missing, so memory use is of concern here.
+ To keep it in check, caching behavior is a little complicated when a
+ template is not found. See ticket #26306 for more details.
+
+ With template debugging disabled, cache the TemplateDoesNotExist class
+ for every missing template and raise a new instance of it after
+ fetching it from the cache.
+
+ With template debugging enabled, a unique TemplateDoesNotExist object
+ is cached for each missing template to preserve debug data. When
+ raising an exception, Python sets __traceback__, __context__, and
+ __cause__ attributes on it. Those attributes can contain references to
+ all sorts of objects up the call chain and caching them creates a
+ memory leak. Thus, unraised copies of the exceptions are cached and
+ copies of those copies are raised after they're fetched from the cache.
+ """
key = self.cache_key(template_name, template_dirs, skip)
cached = self.get_template_cache.get(key)
if cached:
- if isinstance(cached, TemplateDoesNotExist):
- raise cached
+ if isinstance(cached, type) and issubclass(cached, TemplateDoesNotExist):
+ raise cached(template_name)
+ elif isinstance(cached, TemplateDoesNotExist):
+ raise copy_exception(cached)
return cached
try:
@@ -39,7 +60,7 @@ class Loader(BaseLoader):
template_name, template_dirs, skip,
)
except TemplateDoesNotExist as e:
- self.get_template_cache[key] = e
+ self.get_template_cache[key] = copy_exception(e) if self.engine.debug else TemplateDoesNotExist
raise
else:
self.get_template_cache[key] = template