vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: consider default_log_clearing_doctypes as well for clear_log_table

Browse source
This commit is contained in:
phot0n 2025-11-20 12:16:02 +05:30
parent 3bee2cf3bc
commit 3c754cac23
2 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/commands/site.py
View file

@ -1328,20 +1328,19 @@ def clear_log_table(context: CliCtxObj, doctype, days, no_backup):
ref: https://mariadb.com/kb/en/big-deletes/#deleting-more-than-half-a-table
"""
from frappe.core.doctype.log_settings.log_settings import LOG_DOCTYPES
from frappe.core.doctype.log_settings.log_settings import clear_log_table as clear_logs
from frappe.utils.backups import scheduled_backup
if not context.sites:
raise SiteNotSpecifiedError
if doctype not in LOG_DOCTYPES:
raise frappe.ValidationError(f"Unsupported logging DocType: {doctype}")
for site in context.sites:
frappe.init(site)
frappe.connect()
if doctype not in frappe.get_hooks("default_log_clearing_doctypes", {}):
raise frappe.ValidationError(f"Unsupported logging DocType: {doctype}")
if not no_backup:
scheduled_backup(
ignore_conf=False,

14
frappe/core/doctype/log_settings/log_settings.py
View file

@ -147,18 +147,6 @@ def get_log_doctypes(doctype, txt, searchfield, start, page_len, filters):
return supported_doctypes[start:page_len]
LOG_DOCTYPES = [
"Scheduled Job Log",
"Activity Log",
"Route History",
"Email Queue",
"Email Queue Recipient",
"Error Log",
"OAuth Bearer Token",
"API Request Log",
]
def clear_log_table(doctype, days=90):
"""If any logtype table grows too large then clearing it with DELETE query
is not feasible in reasonable time. This command copies recent data to new
@ -168,7 +156,7 @@ def clear_log_table(doctype, days=90):
"""
from frappe.utils import get_table_name
if doctype not in LOG_DOCTYPES:
if doctype not in frappe.get_hooks("default_log_clearing_doctypes", {}):
raise frappe.ValidationError(f"Unsupported logging DocType: {doctype}")
original = get_table_name(doctype)