From 4ab611146a77975154446b1916be73c038a76669 Mon Sep 17 00:00:00 2001
From: Clint Wylie <cwylie@apache.org>
Date: Fri, 10 Dec 2021 21:55:35 -0800
Subject: [PATCH] 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
---
 .../cli/Log4JShutdownPropertyChecker.java     |  3 ++
 .../cli/Log4JShutdownPropertyCheckerTest.java | 43 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 services/src/test/java/org/apache/druid/cli/Log4JShutdownPropertyCheckerTest.java

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 2d02670bb336..fde3c5d1c28e 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 void checkProperties(Properties properties)
     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/test/java/org/apache/druid/cli/Log4JShutdownPropertyCheckerTest.java b/services/src/test/java/org/apache/druid/cli/Log4JShutdownPropertyCheckerTest.java
new file mode 100644
index 000000000000..a3fff7cb4c8f
--- /dev/null
+++ b/services/src/test/java/org/apache/druid/cli/Log4JShutdownPropertyCheckerTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.cli;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Properties;
+
+public class Log4JShutdownPropertyCheckerTest
+{
+  @Test
+  public void test_sets_the_stuff()
+  {
+    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"));
+  }
+}