From 4b93f75eba40625bba5b83cca2470aa179e3f082 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 3 Aug 2020 17:23:32 +0530 Subject: [PATCH] fix: Log site only if exists --- frappe/app.py | 5 ++--- frappe/utils/logger.py | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/app.py b/frappe/app.py index 100b10e9ef..450e3b5f17 100644 --- a/frappe/app.py +++ b/frappe/app.py @@ -99,9 +99,8 @@ def application(request): frappe.monitor.stop(response) frappe.recorder.dump() - _site = get_site_name(request.host) - frappe.logger("frappe.web", allow_site=_site).info({ - "site": _site, + frappe.logger("frappe.web", allow_site=frappe.local.site).info({ + "site": get_site_name(request.host), "remote_addr": getattr(request, "remote_addr", "NOTFOUND"), "base_url": getattr(request, "base_url", "NOTFOUND"), "full_path": getattr(request, "full_path", "NOTFOUND"), diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py index 398cdd0bfc..364ffa776d 100755 --- a/frappe/utils/logger.py +++ b/frappe/utils/logger.py @@ -11,6 +11,7 @@ from six import text_type # imports - module imports import frappe +from frappe.utils import get_sites default_log_level = logging.DEBUG @@ -33,7 +34,7 @@ def get_logger(module=None, with_more_info=False, allow_site=True, filter=None, if allow_site is True: site = getattr(frappe.local, "site", None) - elif allow_site: + elif allow_site in get_sites(): site = allow_site else: site = False