Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Clint Wylie 2021-12-10 21:55:35 -08:00 committed by GitHub
parent 761fe9f144
commit e53c3e80ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
services/src/main/java/org/apache/druid/cli/Log4JShutdownPropertyChecker.java
View File

@ -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");
}
}
}

43
services/src/test/java/org/apache/druid/cli/Log4JShutdownPropertyCheckerTest.java Normal file
View File

@ -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"));
}
}