浏览代码

fix: Add site validation for logger

(cherry picked from commit 476e625261)
version-14
Gavin D'souza 5 年前
committed by mergify-bot
父节点
当前提交
973b01cd02
共有 3 个文件被更改,包括 7 次插入6 次删除
  1. +2
    -2
      frappe/__init__.py
  2. +3
    -2
      frappe/app.py
  3. +2
    -2
      frappe/utils/logger.py

+ 2
- 2
frappe/__init__.py 查看文件

@@ -1559,10 +1559,10 @@ def get_doctype_app(doctype):


loggers = {} loggers = {}
log_level = None log_level = None
def logger(module=None, with_more_info=False):
def logger(module=None, with_more_info=False, _site=None):
'''Returns a python logger that uses StreamHandler''' '''Returns a python logger that uses StreamHandler'''
from frappe.utils.logger import get_logger from frappe.utils.logger import get_logger
return get_logger(module=module, with_more_info=with_more_info)
return get_logger(module=module, with_more_info=with_more_info, _site=_site)


def log_error(message=None, title=_("Error")): def log_error(message=None, title=_("Error")):
'''Log error to Error Log''' '''Log error to Error Log'''


+ 3
- 2
frappe/app.py 查看文件

@@ -99,8 +99,9 @@ def application(request):
frappe.monitor.stop(response) frappe.monitor.stop(response)
frappe.recorder.dump() frappe.recorder.dump()


frappe.logger("frappe.web").info({
"site": get_site_name(request.host),
_site = get_site_name(request.host)
frappe.logger("frappe.web", _site=_site).info({
"site": _site,
"remote_addr": getattr(request, "remote_addr", "NOTFOUND"), "remote_addr": getattr(request, "remote_addr", "NOTFOUND"),
"base_url": getattr(request, "base_url", "NOTFOUND"), "base_url": getattr(request, "base_url", "NOTFOUND"),
"full_path": getattr(request, "full_path", "NOTFOUND"), "full_path": getattr(request, "full_path", "NOTFOUND"),


+ 2
- 2
frappe/utils/logger.py 查看文件

@@ -17,7 +17,7 @@ default_log_level = logging.DEBUG
site = getattr(frappe.local, 'site', None) site = getattr(frappe.local, 'site', None)




def get_logger(module, with_more_info=False):
def get_logger(module, with_more_info=False, _site=None):
global site global site
if module in frappe.loggers: if module in frappe.loggers:
return frappe.loggers[module] return frappe.loggers[module]
@@ -38,7 +38,7 @@ def get_logger(module, with_more_info=False):
handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20) handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
logger.addHandler(handler) logger.addHandler(handler)
# #
if site:
if site == _site:
SITELOG_FILENAME = os.path.join(site, 'logs', logfile) SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20) site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
site_handler.setFormatter(formatter) site_handler.setFormatter(formatter)


正在加载...
取消
保存