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

OrientDB: Use log wait strategy for more reliable readiness detection #4471

Merged
merged 6 commits into from
Oct 11, 2021
Merged

OrientDB: Use log wait strategy for more reliable readiness detection #4471

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c71ac6
OrientDB: Use log wait strategy for more reliable readiness detection
rnorth Sep 20, 2021
e3da4c2
Simplify log regex
rnorth Sep 20, 2021
459b6af
Merge branch 'master' into orientdb-log-wait
rnorth Sep 20, 2021
a39e3a0
Remove HTTP wait
rnorth Sep 20, 2021
a0e2b21
Merge remote-tracking branch 'origin/orientdb-log-wait' into orientdb…
rnorth Sep 20, 2021
7f057bf
Remove unused imports
rnorth Sep 20, 2021
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
17 changes: 2 additions & 15 deletions modules/orientdb/src/main/java/org/testcontainers/containers/OrientDBContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,14 @@
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
import org.testcontainers.containers.wait.strategy.WaitStrategy;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
import org.testcontainers.utility.DockerImageName;

import java.io.IOException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.Optional;

import static java.net.HttpURLConnection.HTTP_OK;

/**
* @author robfrank
*/
Expand Down Expand Up @@ -68,14 +62,7 @@ public OrientDBContainer(final DockerImageName dockerImageName) {
serverPassword = DEFAULT_SERVER_PASSWORD;
databaseName = DEFAULT_DATABASE_NAME;

WaitStrategy waitForHttp = new HttpWaitStrategy()
.forPort(DEFAULT_HTTP_PORT)
.forStatusCodeMatching(response -> response == HTTP_OK);

waitStrategy = new WaitAllStrategy()
.withStrategy(Wait.forListeningPort())
.withStrategy(waitForHttp)
.withStartupTimeout(Duration.ofMinutes(2));
waitStrategy = new LogMessageWaitStrategy().withRegEx(".*Gremlin started correctly.*");

addExposedPorts(DEFAULT_BINARY_PORT, DEFAULT_HTTP_PORT);
}
Expand Down