From e02e64049769c74b11bf1ebcde0ac8e1b72f722d Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Thu, 31 Mar 2022 14:50:15 +0530 Subject: [PATCH] perf: dont cache `assets_json` in Redis for `developer_mode` --- frappe/utils/__init__.py | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index fe4599caeb..62b8df40b6 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -791,24 +791,25 @@ def get_build_version(): return frappe.utils.random_string(8) def get_assets_json(): + def _get_assets(): + # get merged assets.json and assets-rtl.json + assets = frappe.parse_json(frappe.read_file("assets/assets.json")) + + if assets_rtl := frappe.read_file("assets/assets-rtl.json"): + assets.update(frappe.parse_json(assets_rtl)) + + return assets + if not hasattr(frappe.local, "assets_json"): - cache = frappe.cache() - assets = None - if not frappe.conf.developer_mode: - assets = cache.get_value("assets_json", shared=True) + frappe.local.assets_json = frappe.cache().get_value( + "assets_json", + _get_assets, + shared=True, + ) - if not assets: - # get merged assets.json and assets-rtl.json - assets = frappe.parse_json(frappe.read_file("assets/assets.json")) - - if assets_rtl := frappe.read_file("assets/assets-rtl.json"): - assets.update(frappe.parse_json(assets_rtl)) - - # save in cache - cache.set_value("assets_json", assets, shared=True) - - frappe.local.assets_json = assets + else: + frappe.local.assets_json = _get_assets() return frappe.local.assets_json