Skip to content
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

Jump to bottom

Display Ryuk logs when it fails to start #4842

Merged
merged 5 commits into from Jan 5, 2022
Merged

Display Ryuk logs when it fails to start #4842

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
80945ae
Display Ryuk logs when it fails to start
Jan 3, 2022
1052a75
Update core/src/main/java/org/testcontainers/utility/ResourceReaper.java
vincz7777 Jan 4, 2022
c7cfc80
Move try/catch block outside until() method
Jan 4, 2022
d5816c0
Update ResourceReaper.java
bsideup Jan 4, 2022
3d178d7
Merge branch 'master' into ryuk-failure-display-logs
rnorth Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions core/src/main/java/org/testcontainers/utility/ResourceReaper.java
View file
Open in desktop
Expand Up @@ -34,7 +34,6 @@
import java.net.Socket;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.AbstractMap.SimpleEntry;
import java.util.ArrayList;
import java.util.Collections;
Expand Down Expand Up @@ -141,7 +140,14 @@ public void onNext(Frame frame) {
.pollInterval(DynamicPollInterval.ofMillis(50))
.pollInSameThread()
.until(
() -> client.inspectContainerCmd(ryukContainerId).exec(),
() -> {
try {
return client.inspectContainerCmd(ryukContainerId).exec();
} catch(NotFoundException e) {
vincz7777 marked this conversation as resolved.
Show resolved Hide resolved
log.debug("Ryuk container cannot be found and probably had a problem starting. Ryuk's logs:\n{}", ryukLog);
bsideup marked this conversation as resolved.
Show resolved Hide resolved
throw e;
}
},
inspectContainerResponse -> {
return inspectContainerResponse
.getNetworkSettings()
Expand Down