root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish "Add Log Output when DevTools restart is disabled" 

Closes gh-14807
This commit is contained in:
Andy Wilkinson 2018-10-29 12:38:43 +00:00
parent e76605ff75
commit 8ec9f23719
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartApplicationListener.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -68,17 +68,16 @@ public class RestartApplicationListener
if (enabled == null || Boolean.parseBoolean(enabled)) { if (enabled == null || Boolean.parseBoolean(enabled)) {
String[] args = event.getArgs(); String[] args = event.getArgs();
DefaultRestartInitializer initializer = new DefaultRestartInitializer(); DefaultRestartInitializer initializer = new DefaultRestartInitializer();
boolean restartOnInitialize = true; boolean restartOnInitialize = !AgentReloader.isActive();
if (AgentReloader.isActive()) { if (!restartOnInitialize) {
logger.info( logger.info(
"Restart disabled due to an agent-based reloader being active"); "Restart disabled due to an agent-based reloader being active");
restartOnInitialize = false;
} }
Restarter.initialize(args, false, initializer, restartOnInitialize); Restarter.initialize(args, false, initializer, restartOnInitialize);
} }
else { else {
logger.info("Restart disabled due to System property '" + ENABLED_PROPERTY logger.info("Restart disabled due to System property '" + ENABLED_PROPERTY
+ "' set to false"); + "' being set to false");
Restarter.disable(); Restarter.disable();
} }
} }

8
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartApplicationListenerTests.java
View File

@ -20,6 +20,7 @@ import java.util.List;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
@ -27,6 +28,7 @@ import org.springframework.boot.context.event.ApplicationFailedEvent;
import org.springframework.boot.context.event.ApplicationPreparedEvent; import org.springframework.boot.context.event.ApplicationPreparedEvent;
import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.boot.context.event.ApplicationStartingEvent; import org.springframework.boot.context.event.ApplicationStartingEvent;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.util.ReflectionTestUtils;
@ -47,6 +49,9 @@ public class RestartApplicationListenerTests {
private static final String[] ARGS = new String[] { "a", "b", "c" }; private static final String[] ARGS = new String[] { "a", "b", "c" };
@Rule
public final OutputCapture output = new OutputCapture();
@Before @Before
@After @After
public void cleanup() { public void cleanup() {
@ -81,8 +86,11 @@ public class RestartApplicationListenerTests {
@Test @Test
public void disableWithSystemProperty() { public void disableWithSystemProperty() {
System.setProperty(ENABLED_PROPERTY, "false"); System.setProperty(ENABLED_PROPERTY, "false");
this.output.reset();
testInitialize(false); testInitialize(false);
assertThat(Restarter.getInstance()).hasFieldOrPropertyWithValue("enabled", false); assertThat(Restarter.getInstance()).hasFieldOrPropertyWithValue("enabled", false);
assertThat(this.output.toString())
.contains("Restart disabled due to System property");
} }
private void testInitialize(boolean failed) { private void testInitialize(boolean failed) {