fix: Log site only if exists

nikhildx · Aug 3, 2020 · 4b93f75 · 4b93f75
1 parent 9445c11
commit 4b93f75
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -11,6 +11,7 @@
 
 # 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