Skip to content

Fix shutdownDisable not taking effect(#2614) #3508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 21, 2025
Merged

Fix shutdownDisable not taking effect(#2614) #3508

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
42fbaaf
Fix shutdownDisable not taking effect(#2614)
Pluto-syd Feb 28, 2025
fc1fb47
Fix the `log4j2.isWebapp` property naming
vy Mar 14, 2025
0be6b19
Revert the `status` change
vy Mar 14, 2025
ecf8b88
Fix shutdownDisable not taking effect (#2614)
Pluto-syd Mar 14, 2025
9d4f182
Merge remote-tracking branch 'origin/bugfix/issue-2614' into bugfix/i…
Pluto-syd Mar 14, 2025
c3cd060
Merge remote-tracking branch 'origin/2.x' into bugfix/issue-2614
Pluto-syd Mar 21, 2025
778b731
add changelog for pr(#3508)
Pluto-syd Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion log4j-core-test/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,24 @@
package org.apache.logging.log4j.core;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;

import java.lang.reflect.Field;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
import org.apache.logging.log4j.core.util.ReflectionUtil;
import org.apache.logging.log4j.test.junit.SetTestProperty;
import org.junit.jupiter.api.Test;

@SetTestProperty(key = "log4j2.is.webapp", value = "false")
@LoggerContextSource("log4j-test3.xml")
class ShutdownDisabledTest {

@Test
void testShutdownFlag(final Configuration config) {
void testShutdownFlag(final Configuration config, final LoggerContext ctx) throws NoSuchFieldException {
Field shutdownCallback = LoggerContext.class.getDeclaredField("shutdownCallback");
Object fieldValue = ReflectionUtil.getFieldValue(shutdownCallback, ctx);
assertFalse(config.isShutdownHookEnabled(), "Shutdown hook is enabled");
assertNull(fieldValue, "Shutdown callback is null");
}
}
2 changes: 1 addition & 1 deletion log4j-core-test/src/test/resources/log4j-test3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<Configuration status="OFF" name="XMLConfigTest" monitorInterval="5" shutdownHook="disable">
<Configuration status="DEBUG" name="XMLConfigTest" monitorInterval="5" shutdownHook="disable">
<Appenders>
<Console name="STDOUT">
<PatternLayout pattern="%m MDC%X%n"/>
Expand Down
3 changes: 2 additions & 1 deletion log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,8 @@ public void start(final Configuration config) {
if (configLock.tryLock()) {
try {
if (this.isInitialized() || this.isStopped()) {
this.setStarting();
setConfiguration(config);
if (this.configuration.isShutdownHookEnabled()) {
setUpShutdownHook();
}
Expand All @@ -330,7 +332,6 @@ public void start(final Configuration config) {
configLock.unlock();
}
}
setConfiguration(config);
LOGGER.info("{}[name={}] started with configuration {}.", getClass().getSimpleName(), getName(), config);
}

Expand Down
Loading