From 97c17102df35fa7852a4981e8bc139b818121d64 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 6 Jan 2025 10:55:15 +0530 Subject: [PATCH] perf: Do not apply usage limit tracking on dedicated servers It's extra overhead. It doesn't do anything right now as it is kept very high to avoid ever hitting that limit on dedicated servers. --- press/press/doctype/site/site.py | 9 +++++++-- press/press/doctype/site_plan/site_plan.py | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/press/press/doctype/site/site.py b/press/press/doctype/site/site.py index 45fb8eb11f..8434b45e81 100644 --- a/press/press/doctype/site/site.py +++ b/press/press/doctype/site/site.py @@ -69,7 +69,7 @@ from press.press.doctype.server.server import is_dedicated_server from press.press.doctype.site_activity.site_activity import log_site_activity from press.press.doctype.site_analytics.site_analytics import create_site_analytics -from press.press.doctype.site_plan.site_plan import get_plan_config +from press.press.doctype.site_plan.site_plan import UNLIMITED_PLANS, get_plan_config from press.press.report.mariadb_slow_queries.mariadb_slow_queries import ( get_doctype_name, ) @@ -2124,7 +2124,12 @@ def get_plan_name(self, plan=None): return plan def get_plan_config(self, plan=None): - return get_plan_config(self.get_plan_name(plan)) + plan = self.get_plan_name(plan) + config = get_plan_config(plan) + if plan in UNLIMITED_PLANS: + # PERF: do not usage tracking on unlimited sites. + config.pop("rate_limit") + return config def set_latest_bench(self): from pypika.terms import PseudoColumn diff --git a/press/press/doctype/site_plan/site_plan.py b/press/press/doctype/site_plan/site_plan.py index 86b5920b11..75bc615f7c 100644 --- a/press/press/doctype/site_plan/site_plan.py +++ b/press/press/doctype/site_plan/site_plan.py @@ -6,6 +6,8 @@ from press.press.doctype.site_plan.plan import Plan +UNLIMITED_PLANS = ["Unlimited", "Unlimited - Supported"] + class SitePlan(Plan): # begin: auto-generated types