This is an automated email from the ASF dual-hosted git repository.
cwylie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new e53c3e8 set log4j2.is.webapp to false if not set so that shutdown
hooks are run (#12056)
e53c3e8 is described below
commit e53c3e80ca246c0bc9efd18d23858b791eb6e1a2
Author: Clint Wylie <[email protected]>
AuthorDate: Fri Dec 10 21:55:35 2021 -0800
set log4j2.is.webapp to false if not set so that shutdown hooks are run
(#12056)
* set log4j2.is.webapp to false if not set so that shutdown hooks are run
---
.../druid/cli/Log4JShutdownPropertyChecker.java | 3 +++
.../cli/Log4JShutdownPropertyCheckerTest.java} | 25 ++++++++++++++--------
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git
a/services/src/main/java/org/apache/druid/cli/Log4JShutdownPropertyChecker.java
b/services/src/main/java/org/apache/druid/cli/Log4JShutdownPropertyChecker.java
index 2d02670..fde3c5d 100644
---
a/services/src/main/java/org/apache/druid/cli/Log4JShutdownPropertyChecker.java
+++
b/services/src/main/java/org/apache/druid/cli/Log4JShutdownPropertyChecker.java
@@ -32,5 +32,8 @@ public class Log4JShutdownPropertyChecker implements
PropertyChecker
if (!properties.containsKey("log4j.shutdownHookEnabled")) {
properties.setProperty("log4j.shutdownHookEnabled", "true");
}
+ if (!properties.containsKey("log4j2.is.webapp")) {
+ properties.setProperty("log4j2.is.webapp", "false");
+ }
}
}
diff --git
a/services/src/main/java/org/apache/druid/cli/Log4JShutdownPropertyChecker.java
b/services/src/test/java/org/apache/druid/cli/Log4JShutdownPropertyCheckerTest.java
similarity index 59%
copy from
services/src/main/java/org/apache/druid/cli/Log4JShutdownPropertyChecker.java
copy to
services/src/test/java/org/apache/druid/cli/Log4JShutdownPropertyCheckerTest.java
index 2d02670..a3fff7c 100644
---
a/services/src/main/java/org/apache/druid/cli/Log4JShutdownPropertyChecker.java
+++
b/services/src/test/java/org/apache/druid/cli/Log4JShutdownPropertyCheckerTest.java
@@ -19,18 +19,25 @@
package org.apache.druid.cli;
+import org.junit.Assert;
+import org.junit.Test;
+
import java.util.Properties;
-public class Log4JShutdownPropertyChecker implements PropertyChecker
+public class Log4JShutdownPropertyCheckerTest
{
- @Override
- public void checkProperties(Properties properties)
+ @Test
+ public void test_sets_the_stuff()
{
- if (!properties.containsKey("log4j.shutdownCallbackRegistry")) {
- properties.setProperty("log4j.shutdownCallbackRegistry",
"org.apache.druid.common.config.Log4jShutdown");
- }
- if (!properties.containsKey("log4j.shutdownHookEnabled")) {
- properties.setProperty("log4j.shutdownHookEnabled", "true");
- }
+ Log4JShutdownPropertyChecker checker = new Log4JShutdownPropertyChecker();
+ Properties properties = new Properties();
+ checker.checkProperties(properties);
+
+ Assert.assertEquals(
+ "org.apache.druid.common.config.Log4jShutdown",
+ properties.get("log4j.shutdownCallbackRegistry")
+ );
+ Assert.assertEquals("true", properties.get("log4j.shutdownHookEnabled"));
+ Assert.assertEquals("false", properties.get("log4j2.is.webapp"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
