Author: rgoers
Date: Sat May 10 20:28:17 2014
New Revision: 1593729
URL: http://svn.apache.org/r1593729
Log:
Use a shutdown hook property instead of detecting a web property
Added:
logging/log4j/log4j2/trunk/log4j-web/src/test/java/org/apache/logging/log4j/web/ShutdownPropertyTest.java
- copied, changed from r1593704,
logging/log4j/log4j2/trunk/log4j-web/src/test/java/org/apache/logging/log4j/web/WebPropertyTest.java
Removed:
logging/log4j/log4j2/trunk/log4j-web/src/test/java/org/apache/logging/log4j/web/WebPropertyTest.java
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
logging/log4j/log4j2/trunk/log4j-web/src/main/resources/log4j2.component.properties
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java?rev=1593729&r1=1593728&r2=1593729&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
Sat May 10 20:28:17 2014
@@ -55,7 +55,8 @@ import org.apache.logging.log4j.util.Pro
*/
public class LoggerContext implements
org.apache.logging.log4j.spi.LoggerContext, ConfigurationListener, LifeCycle {
- private static final boolean USING_LOG4J_WEB =
PropertiesUtil.getProperties().getBooleanProperty("log4j-web", false);
+ private static final boolean SHUTDOWN_HOOK_ENABLED =
+
PropertiesUtil.getProperties().getBooleanProperty("log4j.shutdownHookEnabled",
true);
public static final String PROPERTY_CONFIG = "config";
private static final org.apache.logging.log4j.Logger LOGGER =
StatusLogger.getLogger();
@@ -189,7 +190,7 @@ public class LoggerContext implements or
}
private void setUpShutdownHook() {
- if (config.isShutdownHookEnabled() && !USING_LOG4J_WEB) {
+ if (config.isShutdownHookEnabled() && SHUTDOWN_HOOK_ENABLED) {
LOGGER.debug(SHUTDOWN_HOOK, "Shutdown hook enabled. Registering a
new one.");
shutdownThread = new SoftReference<Thread>(
new Thread(new ShutdownThread(this), "log4j-shutdown")
Modified:
logging/log4j/log4j2/trunk/log4j-web/src/main/resources/log4j2.component.properties
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-web/src/main/resources/log4j2.component.properties?rev=1593729&r1=1593728&r2=1593729&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-web/src/main/resources/log4j2.component.properties
(original)
+++
logging/log4j/log4j2/trunk/log4j-web/src/main/resources/log4j2.component.properties
Sat May 10 20:28:17 2014
@@ -1 +1 @@
-log4j-web=true
\ No newline at end of file
+log4j.shutdownHookEnabled=false
\ No newline at end of file
Copied:
logging/log4j/log4j2/trunk/log4j-web/src/test/java/org/apache/logging/log4j/web/ShutdownPropertyTest.java
(from r1593704,
logging/log4j/log4j2/trunk/log4j-web/src/test/java/org/apache/logging/log4j/web/WebPropertyTest.java)
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-web/src/test/java/org/apache/logging/log4j/web/ShutdownPropertyTest.java?p2=logging/log4j/log4j2/trunk/log4j-web/src/test/java/org/apache/logging/log4j/web/ShutdownPropertyTest.java&p1=logging/log4j/log4j2/trunk/log4j-web/src/test/java/org/apache/logging/log4j/web/WebPropertyTest.java&r1=1593704&r2=1593729&rev=1593729&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-web/src/test/java/org/apache/logging/log4j/web/WebPropertyTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-web/src/test/java/org/apache/logging/log4j/web/ShutdownPropertyTest.java
Sat May 10 20:28:17 2014
@@ -19,15 +19,15 @@ package org.apache.logging.log4j.web;
import org.apache.logging.log4j.util.PropertiesUtil;
import org.junit.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
/**
*
*/
-public class WebPropertyTest {
+public class ShutdownPropertyTest {
@Test
public void testWebProperty() {
-
assertTrue(PropertiesUtil.getProperties().getBooleanProperty("log4j-web",
false));
+
assertFalse(PropertiesUtil.getProperties().getBooleanProperty("log4j.shutdownHookEnabled",
true));
}
}
