diff --git a/frappe/app.py b/frappe/app.py index 747464944f..9da7ea71a0 100644 --- a/frappe/app.py +++ b/frappe/app.py @@ -3,7 +3,6 @@ # MIT License. See license.txt from __future__ import unicode_literals -import json import os from six import iteritems import logging diff --git a/frappe/public/js/frappe/recorder/RecorderDetail.vue b/frappe/public/js/frappe/recorder/RecorderDetail.vue index 99e80da4b1..b3391e4201 100644 --- a/frappe/public/js/frappe/recorder/RecorderDetail.vue +++ b/frappe/public/js/frappe/recorder/RecorderDetail.vue @@ -9,7 +9,7 @@ - +
diff --git a/frappe/public/js/frappe/recorder/recorder.js b/frappe/public/js/frappe/recorder/recorder.js index 7ddaefe330..3bae466aad 100644 --- a/frappe/public/js/frappe/recorder/recorder.js +++ b/frappe/public/js/frappe/recorder/recorder.js @@ -1,11 +1,11 @@ -import Vue from 'vue/dist/vue.js' -import VueRouter from 'vue-router/dist/vue-router.js' +import Vue from 'vue/dist/vue.js'; +import VueRouter from 'vue-router/dist/vue-router.js'; -import RecorderRoot from "./RecorderRoot.vue" +import RecorderRoot from "./RecorderRoot.vue"; -import RecorderDetail from "./RecorderDetail.vue" -import RequestDetail from "./RequestDetail.vue" -import SQLDetail from "./SQLDetail.vue" +import RecorderDetail from "./RecorderDetail.vue"; +import RequestDetail from "./RequestDetail.vue"; +import SQLDetail from "./SQLDetail.vue"; frappe.ready(function() { Vue.use(VueRouter) @@ -25,7 +25,7 @@ frappe.ready(function() { path: '/request/:request_uuid/sql/:call_index', component: SQLDetail, }, - ] + ]; const router = new VueRouter({ mode: 'hash', diff --git a/frappe/recorder.py b/frappe/recorder.py index 49b3017dc7..d3b9f36ef1 100644 --- a/frappe/recorder.py +++ b/frappe/recorder.py @@ -89,7 +89,7 @@ class Recorder(): "headers": dict(frappe.local.request.headers), "data": frappe.local.form_dict, } - self._patch() + _patch() def register(self, data): self.calls.append(data) @@ -104,17 +104,19 @@ class Recorder(): "time": self.time, "duration": float("{:0.3f}".format((datetime.datetime.now() - self.time).total_seconds() * 1000)), "method": self.method, - }, default=lambda x: str(x)) + }, default=str) ) frappe.cache().set( "recorder-request-{}".format(self.uuid), - json.dumps(self.calls, default=lambda x: str(x)) + json.dumps(self.calls, default=str) ) - def _patch(self): - frappe.db._sql = frappe.db.sql - frappe.db.sql = sql - frappe.db._sql("SET PROFILING = 1") + +def _patch(): + frappe.db._sql = frappe.db.sql + frappe.db.sql = sql + frappe.db._sql("SET PROFILING = 1") + def compress(data): if data: diff --git a/frappe/www/recorder.py b/frappe/www/recorder.py index 30d7b836da..91515dbd2f 100644 --- a/frappe/www/recorder.py +++ b/frappe/www/recorder.py @@ -5,7 +5,6 @@ from __future__ import unicode_literals import frappe import json -import redis from pygments.formatters import HtmlFormatter def do_not_record():
Index