From f02ef4a905b0a57c6f57cbab206025168f128bae Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 19 Mar 2025 09:49:31 +0530 Subject: [PATCH 1/2] fix: RQ Worker count --- frappe/core/doctype/rq_worker/rq_worker.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/rq_worker/rq_worker.py b/frappe/core/doctype/rq_worker/rq_worker.py index 4f6210ca79..e0bed94009 100644 --- a/frappe/core/doctype/rq_worker/rq_worker.py +++ b/frappe/core/doctype/rq_worker/rq_worker.py @@ -45,10 +45,16 @@ class RQWorker(Document): super(Document, self).__init__(d) @staticmethod - def get_list(start=0, page_length=20): + def get_list(start=0, page_length=0): workers = get_workers() - valid_workers = [w for w in workers if w.pid][start : start + page_length] + valid_workers = [w for w in workers if w.pid] + + if page_length: + valid_workers = valid_workers[start : start + page_length] + else: + valid_workers = valid_workers[start:] + return [serialize_worker(worker) for worker in valid_workers] @staticmethod From 8c0391d0855b30e36a9974603c0c127a58954af7 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 19 Mar 2025 09:54:21 +0530 Subject: [PATCH 2/2] fix: Define InterfaceError for mariadb --- frappe/database/mariadb/database.py | 1 + frappe/database/mariadb/mysqlclient.py | 1 + 2 files changed, 2 insertions(+) diff --git a/frappe/database/mariadb/database.py b/frappe/database/mariadb/database.py index 3f4e555697..9d675eb1aa 100644 --- a/frappe/database/mariadb/database.py +++ b/frappe/database/mariadb/database.py @@ -17,6 +17,7 @@ class MariaDBExceptionUtil: InternalError = pymysql.InternalError SQLError = pymysql.ProgrammingError DataError = pymysql.DataError + InterfaceError = pymysql.InterfaceError # match ER_SEQUENCE_RUN_OUT - https://mariadb.com/kb/en/mariadb-error-codes/ SequenceGeneratorLimitExceeded = pymysql.OperationalError diff --git a/frappe/database/mariadb/mysqlclient.py b/frappe/database/mariadb/mysqlclient.py index 78e521ec23..513f826a99 100644 --- a/frappe/database/mariadb/mysqlclient.py +++ b/frappe/database/mariadb/mysqlclient.py @@ -21,6 +21,7 @@ class MariaDBExceptionUtil: InternalError = MySQLdb.InternalError SQLError = MySQLdb.ProgrammingError DataError = MySQLdb.DataError + InterfaceError = MySQLdb.InterfaceError # match SEQUENCE_RUN_OUT - https://mariadb.com/kb/en/mariadb-error-codes/ SequenceGeneratorLimitExceeded = MySQLdb.OperationalError