浏览代码

Merge pull request #16467 from resilient-tech/perf-assets-2

perf: dont cache `assets_json` in Redis for `developer_mode`
version-14
Sagar Vora 3 年前
committed by GitHub
父节点
当前提交
d606b873ae
找不到此签名对应的密钥 GPG 密钥 ID: 4AEE18F83AFDEB23
共有 1 个文件被更改,包括 15 次插入14 次删除
  1. +15
    -14
      frappe/utils/__init__.py

+ 15
- 14
frappe/utils/__init__.py 查看文件

@@ -791,24 +791,25 @@ def get_build_version():
return frappe.utils.random_string(8) return frappe.utils.random_string(8)


def get_assets_json(): def get_assets_json():
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)
def _get_assets():
# get merged assets.json and assets-rtl.json
assets = frappe.parse_json(frappe.read_file("assets/assets.json"))


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))


if assets_rtl := frappe.read_file("assets/assets-rtl.json"):
assets.update(frappe.parse_json(assets_rtl))
return assets


# save in cache
cache.set_value("assets_json", assets, shared=True)
if not hasattr(frappe.local, "assets_json"):
if not frappe.conf.developer_mode:
frappe.local.assets_json = frappe.cache().get_value(
"assets_json",
_get_assets,
shared=True,
)


frappe.local.assets_json = assets
else:
frappe.local.assets_json = _get_assets()


return frappe.local.assets_json return frappe.local.assets_json




正在加载...
取消
保存