From cd5f51cf28c1a4926fe80a2ab41527111d5ad088 Mon Sep 17 00:00:00 2001 From: bixiaopeng Date: Mon, 4 Jun 2018 21:18:50 +0800 Subject: [PATCH 1/2] [#2179]:Fix that the exclusion check not effects the path which in the exclusion list itself. --- framework/pym/play/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/pym/play/utils.py b/framework/pym/play/utils.py index 84f36b5557..88866ba1f7 100644 --- a/framework/pym/play/utils.py +++ b/framework/pym/play/utils.py @@ -50,7 +50,7 @@ def isExcluded(path, exclusion_list = None): if exclusion_list is None: return False for exclusion in exclusion_list: - if isParentOf(exclusion, path): + if isParentOf(exclusion, path) or exclusion == path: return True return False From 88b8df1ad48c6be2ba6fa4d1df61dc424bccc494 Mon Sep 17 00:00:00 2001 From: bixiaopeng Date: Fri, 22 Jun 2018 00:15:13 +0800 Subject: [PATCH 2/2] bugfix[#2180]:sometime cant load the log config file properly --- framework/src/play/Logger.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/src/play/Logger.java b/framework/src/play/Logger.java index abe4113ee2..7a2061ad44 100644 --- a/framework/src/play/Logger.java +++ b/framework/src/play/Logger.java @@ -60,12 +60,12 @@ public class Logger { */ public static void init() { String log4jPath = Play.configuration.getProperty("application.log.path", "/log4j.xml"); - URL log4jConf = Logger.class.getResource(log4jPath); + URL log4jConf = Thread.currentThread().getContextClassLoader().getResource(log4jPath); boolean isXMLConfig = log4jPath.endsWith(".xml"); if (log4jConf == null) { // try again with the .properties isXMLConfig = false; log4jPath = Play.configuration.getProperty("application.log.path", "/log4j.properties"); - log4jConf = Logger.class.getResource(log4jPath); + log4jConf = Thread.currentThread().getContextClassLoader().getResource(log4jPath); } if (log4jConf == null) { Properties shutUp = new Properties();