Merge pull request #13 from dbreen/master

Add a stacktrace to the records to show where the searches were originated

Author: Benoss

elastic_panel/panel.py

@@ -1,9 +1,9 @@
 import hashlib
 import json
-import traceback
 
 from debug_toolbar.panels import Panel
-from debug_toolbar.utils import ThreadCollector
+from debug_toolbar.utils import ThreadCollector, get_stack, tidy_stacktrace, render_stacktrace, \
+    get_module_path, hidden_paths
 from django.templatetags.static import static
 from django.utils.translation import gettext_lazy as _
 from elasticsearch.connection.base import Connection
@@ -30,6 +30,9 @@ def _pretty_json(data):
         return data
 
 
+hidden_paths.append(get_module_path(__name__))
+
+
 class ElasticQueryInfo:
     def __init__(self, method, full_url, path, body, status_code, response, duration):
         if not body:
@@ -38,7 +41,6 @@ def __init__(self, method, full_url, path, body, status_code, response, duration
             self.body = _pretty_json(body)
             if isinstance(self.body, bytes):
                 self.body = self.body.decode("ascii", "ignore")
-        self.traceback = "".join(traceback.format_stack()[:-2])
         self.method = method
         self.full_url = full_url
         self.path = path
@@ -48,6 +50,7 @@ def __init__(self, method, full_url, path, body, status_code, response, duration
         self.hash = hashlib.md5(
             self.full_url.encode("ascii", "ignore") + self.body.encode("ascii", "ignore")
         ).hexdigest()
+        self.stacktrace = tidy_stacktrace(reversed(get_stack()))
 
 
 class ElasticDebugPanel(Panel):
@@ -98,6 +101,7 @@ def generate_stats(self, request, response):
             if record.hash in hashs:
                 self.nb_duplicates += 1
             hashs.add(record.hash)
+            record.stacktrace = render_stacktrace(record.stacktrace)
 
         self.nb_queries = len(records)
 

elastic_panel/static/elastic_panel/js/elastic_panel.js

@@ -12,9 +12,11 @@ var uarr = String.fromCharCode(0x25b6),
 
 var showHandler = function(e) {
 
-    toggle(this.nextElementSibling)
+    if(this.nextElementSibling) {
+        toggle(this.nextElementSibling)
+    }
 
-    var arrow = document.querySelector('a.elasticShowTemplate .toggleArrow')
+    var arrow = this.children[0];
     arrow.textContent = arrow.textContent == uarr ? darr : uarr
 
     toggle(this.parentNode.nextElementSibling)

elastic_panel/templates/elastic_panel/elastic_panel.html

@@ -35,15 +35,15 @@
         <dd>
             <div class="djTemplateShowContextDiv">
                 <a class="elasticShowTemplate">
-                    <span class="toggleArrow">▶</span> Show Traceback
+                    <span class="toggleArrow">▶</span> Show Stacktrace
                 </a>
-                <a class="selectText" style="display: none;"> -&gt; (Select All Json for ctrl + c)</a>
             </div>
             <div class="djTemplateHideContextDiv" style="display: none;">
-                <code class="json_code" contenteditable="true" >{{record.traceback}}</code>
+                <pre class="djdt-stack">
+                    {{record.stacktrace}}
+                </pre>
             </div>
         </dd>
-        </dt>
     {% endfor %}
     </dl>
 {% else %}