aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAymeric Augustin2014-03-13 22:21:42 +0100
committerAymeric Augustin2014-03-13 22:21:42 +0100
commit110b509f8d10a2c877fb4175e8cfa0484eb7bcc2 (patch)
tree2f11b1ce1180f144664b21621787e817bbdc889a
parentb3e2c1afb1518802609f493343165a90169ae64a (diff)
parentaa99ebc2a22b71bd1894a53059275f7281f67a71 (diff)
downloaddjango-debug-toolbar-110b509f8d10a2c877fb4175e8cfa0484eb7bcc2.tar.bz2
Merge pull request #560 from tim-schilling/profiler-max-depth-settings-515
Allow profiler max depth to be configurable.
-rw-r--r--debug_toolbar/panels/profiling.py6
-rw-r--r--debug_toolbar/settings.py1
-rw-r--r--docs/configuration.rst9
3 files changed, 15 insertions, 1 deletions
diff --git a/debug_toolbar/panels/profiling.py b/debug_toolbar/panels/profiling.py
index 7399c16..9020799 100644
--- a/debug_toolbar/panels/profiling.py
+++ b/debug_toolbar/panels/profiling.py
@@ -3,6 +3,7 @@ from __future__ import absolute_import, division, unicode_literals
from django.utils.translation import ugettext_lazy as _
from django.utils.safestring import mark_safe
from debug_toolbar.panels import Panel
+from debug_toolbar import settings as dt_settings
import cProfile
from pstats import Stats
@@ -152,6 +153,9 @@ class ProfilingPanel(Panel):
root = FunctionCall(self.stats, self.stats.get_root_func(), depth=0)
func_list = []
- self.add_node(func_list, root, 10, root.stats[3] / 8)
+ self.add_node(func_list,
+ root,
+ dt_settings.CONFIG['PROFILER_MAX_DEPTH'],
+ root.stats[3] / 8)
self.record_stats({'func_list': func_list})
diff --git a/debug_toolbar/settings.py b/debug_toolbar/settings.py
index 9ec2736..5c1cd3d 100644
--- a/debug_toolbar/settings.py
+++ b/debug_toolbar/settings.py
@@ -33,6 +33,7 @@ CONFIG_DEFAULTS = {
'debug_toolbar',
'django',
),
+ 'PROFILER_MAX_DEPTH': 10,
'SHOW_TEMPLATE_CONTEXT': True,
'SQL_WARNING_THRESHOLD': 500, # milliseconds
}
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 7f7461b..f6b4c20 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -149,6 +149,15 @@ Panel options
Useful for eliminating server-related entries which can result
in enormous DOM structures and toolbar rendering delays.
+* ``PROFILER_MAX_DEPTH``
+
+ Default: ``10``
+
+ Panel: profiling
+
+ This setting affects the depth of function calls in the profiler's
+ analysis.
+
* ``SHOW_TEMPLATE_CONTEXT``
Default: ``True``