Skip to content

Commit

Permalink
set log4j2.is.webapp to false if not set so that shutdown hooks are r…
Browse files Browse the repository at this point in the history
…un (apache#12056) (#65)

* set log4j2.is.webapp to false if not set so that shutdown hooks are run

Co-authored-by: Clint Wylie <cwylie@apache.org>
  • Loading branch information
CodingParsley and clintropolis authored Jan 24, 2022
1 parent 60f325c commit 16f6710
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
}
Original file line number Diff line number Diff line change
@@ -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"));
}
}

0 comments on commit 16f6710

Please sign in to comment.