Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve diagnostics when remote application does not start as expected

Browse Source 
See gh-22909
This commit is contained in:
Andy Wilkinson 2020-08-12 13:15:36 +01:00
parent 65ccb514d0
commit 2b1bb2f18f
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
spring-boot-project/spring-boot-devtools/src/intTest/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java
View File

@ -24,6 +24,7 @@ import java.util.List;
import java.util.function.BiFunction;
import org.awaitility.Awaitility;
import org.awaitility.core.ConditionTimeoutException;
import org.springframework.boot.devtools.RemoteSpringApplication;
import org.springframework.boot.devtools.tests.JvmLauncher.LaunchedJvm;
@ -77,7 +78,7 @@ abstract class RemoteApplicationLauncher extends AbstractApplicationLauncher {
createRemoteSpringApplicationClassPath(classesDirectory),
RemoteSpringApplication.class.getName(), "--spring.devtools.remote.secret=secret",
"http://localhost:" + port);
awaitRemoteSpringApplication(remoteSpringApplicationJvm.getStandardOut());
awaitRemoteSpringApplication(remoteSpringApplicationJvm);
return remoteSpringApplicationJvm.getProcess();
}
catch (Exception ex) {
@ -105,10 +106,22 @@ abstract class RemoteApplicationLauncher extends AbstractApplicationLauncher {
.getServerPort();
}
private void awaitRemoteSpringApplication(File standardOut) throws Exception {
FileContents contents = new FileContents(standardOut);
Awaitility.waitAtMost(Duration.ofSeconds(30)).until(contents::get,
containsString("Started RemoteSpringApplication"));
private void awaitRemoteSpringApplication(LaunchedJvm launchedJvm) throws Exception {
FileContents contents = new FileContents(launchedJvm.getStandardOut());
try {
Awaitility.waitAtMost(Duration.ofSeconds(30)).until(contents::get,
containsString("Started RemoteSpringApplication"));
}
catch (ConditionTimeoutException ex) {
if (!launchedJvm.getProcess().isAlive()) {
throw new IllegalStateException(
"Process exited with status " + launchedJvm.getProcess().exitValue()
+ " before producing expected standard output.\n\nStandard output:\n\n" + contents.get()
+ "\n\nStandard error:\n\n" + new FileContents(launchedJvm.getStandardError()).get(),
ex);
}
throw ex;
}
}
}