Repository: kylin Updated Branches: refs/heads/2.0-rc 827a995da -> 5e0e8e09e
KYLIN-1268 Take better care of DebugTomcat's log Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5e0e8e09 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5e0e8e09 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5e0e8e09 Branch: refs/heads/2.0-rc Commit: 5e0e8e09e98269250105336fea4eee523873f943 Parents: 827a995 Author: Li, Yang <yang...@ebay.com> Authored: Fri Jan 22 17:19:24 2016 +0800 Committer: Li, Yang <yang...@ebay.com> Committed: Fri Jan 22 17:20:04 2016 +0800 ---------------------------------------------------------------------- .../apache/kylin/rest/util/Log4jConfigListener.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/5e0e8e09/server/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java b/server/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java index 19c76ea..23b327a 100644 --- a/server/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java +++ b/server/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java @@ -20,25 +20,28 @@ package org.apache.kylin.rest.util; import javax.servlet.ServletContextEvent; +import org.apache.kylin.common.KylinConfig; + public class Log4jConfigListener extends org.springframework.web.util.Log4jConfigListener { - private boolean isTesting; + private boolean isDebugTomcat; public Log4jConfigListener() { - // set by DebugTomcat - this.isTesting = "testing".equals(System.getProperty("spring.profiles.active")); + // check if is DebugTomcat + String property = System.getProperty(KylinConfig.KYLIN_CONF); + this.isDebugTomcat = property != null && property.contains("examples/test_case_data/sandbox"); } @Override public void contextInitialized(ServletContextEvent event) { - if (!isTesting) { + if (!isDebugTomcat) { super.contextInitialized(event); } } @Override public void contextDestroyed(ServletContextEvent event) { - if (!isTesting) { + if (!isDebugTomcat) { super.contextDestroyed(event); } }
