From 3ce2cf28e53574b8e804e6fe45c65e152298bdf3 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Sun, 17 Feb 2019 14:54:41 +0530 Subject: [PATCH] fix(recorder): Remove recoder web page --- .../js/frappe/recorder/RecorderDetail.vue | 8 +-- .../js/frappe/recorder/RequestDetail.vue | 2 +- frappe/recorder.py | 60 +++++++++++++++++ frappe/www/recorder.html | 11 --- frappe/www/recorder.py | 67 ------------------- 5 files changed, 65 insertions(+), 83 deletions(-) delete mode 100644 frappe/www/recorder.html delete mode 100644 frappe/www/recorder.py diff --git a/frappe/public/js/frappe/recorder/RecorderDetail.vue b/frappe/public/js/frappe/recorder/RecorderDetail.vue index 0c335d10c6..a17714c4eb 100644 --- a/frappe/public/js/frappe/recorder/RecorderDetail.vue +++ b/frappe/public/js/frappe/recorder/RecorderDetail.vue @@ -204,25 +204,25 @@ export default { } }, refresh: function() { - frappe.call("frappe.www.recorder.get_requests").then( r => { + frappe.call("frappe.recorder.get_requests").then( r => { this.requests = r.message; this.last_fetched = new Date(); }); }, clear: function() { - frappe.call("frappe.www.recorder.erase_requests"); + frappe.call("frappe.recorder.erase_requests"); this.refresh(); }, record: function(should_record) { frappe.call({ - method: "frappe.www.recorder.set_recorder_state", + method: "frappe.recorder.set_recorder_state", args: { should_record: should_record } }).then(r => this.update_status(r.message)); }, fetch_status: function() { - frappe.call("frappe.www.recorder.get_status").then(r => this.update_status(r.message)); + frappe.call("frappe.recorder.get_status").then(r => this.update_status(r.message)); }, update_status: function(status) { this.status = status; diff --git a/frappe/public/js/frappe/recorder/RequestDetail.vue b/frappe/public/js/frappe/recorder/RequestDetail.vue index d995d31d6f..80231f9022 100644 --- a/frappe/public/js/frappe/recorder/RequestDetail.vue +++ b/frappe/public/js/frappe/recorder/RequestDetail.vue @@ -206,7 +206,7 @@ export default { }, mounted() { frappe.call({ - method: "frappe.www.recorder.get_request_data", + method: "frappe.recorder.get_request_data", args: { uuid: this.$route.params.request_uuid } diff --git a/frappe/recorder.py b/frappe/recorder.py index 43c4563907..0d0bde2031 100644 --- a/frappe/recorder.py +++ b/frappe/recorder.py @@ -128,3 +128,63 @@ def compress(data): else: keys, values = [], [] return {"keys": keys, "values": values} + + +def do_not_record(): + if hasattr(frappe.local, "_recorder"): + del frappe.local._recorder + frappe.db.sql = frappe.db._sql + + +def get_context(context): + do_not_record() + if frappe.request.path[-1] != "/": + frappe.local.flags.redirect_location = "recorder/" + raise frappe.Redirect + return {"highlight": HtmlFormatter().get_style_defs()} + +@frappe.whitelist() +def get_status(): + do_not_record() + if frappe.cache().get("recorder-intercept"): + return {"status": "Active", "color": "green"} + return {"status": "Inactive", "color": "red"} + + +@frappe.whitelist() +def set_recorder_state(should_record): + do_not_record() + if should_record == "true": + frappe.cache().set("recorder-intercept", 1) + return {"status": "Active", "color": "green"} + else: + frappe.cache().delete("recorder-intercept") + return {"status": "Inactive", "color": "red"} + + +@frappe.whitelist() +def get_requests(): + do_not_record() + requests = frappe.cache().lrange("recorder-requests", 0, -1) + requests = list(map(lambda request: json.loads(request.decode()), requests)) + for index, request in enumerate(requests, start=1): + request["index"] = index + return requests + + +@frappe.whitelist() +def erase_requests(): + do_not_record() + frappe.cache().delete_value("recorder-requests") + + +@frappe.whitelist() +def get_request_data(uuid): + do_not_record() + request = json.loads(frappe.cache().get("recorder-request-{}".format(uuid)).decode()) + calls = request["calls"] + for index, call in enumerate(calls): + call["index"] = index + + return request + diff --git a/frappe/www/recorder.html b/frappe/www/recorder.html deleted file mode 100644 index f46e2f00b9..0000000000 --- a/frappe/www/recorder.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "templates/web.html" %} - -{% block title %}{{ heading or "Recorder"}}{% endblock %} - -{% block page_content %} - -
- - - -{% endblock %} diff --git a/frappe/www/recorder.py b/frappe/www/recorder.py deleted file mode 100644 index 7b0d2f373c..0000000000 --- a/frappe/www/recorder.py +++ /dev/null @@ -1,67 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -import json -from pygments.formatters import HtmlFormatter - -def do_not_record(): - if hasattr(frappe.local, "_recorder"): - del frappe.local._recorder - frappe.db.sql = frappe.db._sql - - -def get_context(context): - do_not_record() - if frappe.request.path[-1] != "/": - frappe.local.flags.redirect_location = "recorder/" - raise frappe.Redirect - return {"highlight": HtmlFormatter().get_style_defs()} - -@frappe.whitelist() -def get_status(): - do_not_record() - if frappe.cache().get("recorder-intercept"): - return {"status": "Active", "color": "green"} - return {"status": "Inactive", "color": "red"} - - -@frappe.whitelist() -def set_recorder_state(should_record): - do_not_record() - if should_record == "true": - frappe.cache().set("recorder-intercept", 1) - return {"status": "Active", "color": "green"} - else: - frappe.cache().delete("recorder-intercept") - return {"status": "Inactive", "color": "red"} - - -@frappe.whitelist() -def get_requests(): - do_not_record() - requests = frappe.cache().lrange("recorder-requests", 0, -1) - requests = list(map(lambda request: json.loads(request.decode()), requests)) - for index, request in enumerate(requests, start=1): - request["index"] = index - return requests - - -@frappe.whitelist() -def erase_requests(): - do_not_record() - frappe.cache().delete_value("recorder-requests") - - -@frappe.whitelist() -def get_request_data(uuid): - do_not_record() - request = json.loads(frappe.cache().get("recorder-request-{}".format(uuid)).decode()) - calls = request["calls"] - for index, call in enumerate(calls): - call["index"] = index - - return request -