Skip to content

Fix docker cleanup #357

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

Draft
w1am wants to merge 1 commit into
base: trunk
Choose a base branch
from
Draft

Fix docker cleanup #357

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 25 additions & 5 deletions src/test/java/io/kurrent/dbclient/databases/DockerContainerDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,32 @@ public ClientTracker getClientTracker() {
@Override
public void cleanup() {
try {
ExecResult result = execInContainer("tar", "-czvf", "/tmp/esdb_logs.tar.gz", "/var/log/eventstore");
if (result.getExitCode() != 0) {
logger().error(result.getStderr());
throw new RuntimeException("Error when compressing server logs");
try {
ExecResult checkDir = execInContainer("sh", "-c", "[ -d /var/log/eventstore ] && echo 'eventstore' || [ -d /var/log/kurrentdb ] && echo 'kurrentdb' || echo 'none'");
String logDir = checkDir.getStdout().trim();

if ("eventstore".equals(logDir)) {
logger().info("Collecting logs from /var/log/eventstore");
ExecResult result = execInContainer("tar", "-czvf", "/tmp/esdb_logs.tar.gz", "/var/log/eventstore");
if (result.getExitCode() == 0) {
copyFileFromContainer("/tmp/esdb_logs.tar.gz", "/tmp/esdb_logs.tar.gz");
} else {
logger().warn("Failed to compress logs: {}", result.getStderr());
}
} else if ("kurrentdb".equals(logDir)) {
logger().info("Collecting logs from /var/log/kurrentdb");
ExecResult result = execInContainer("tar", "-czvf", "/tmp/esdb_logs.tar.gz", "/var/log/kurrentdb");
if (result.getExitCode() == 0) {
copyFileFromContainer("/tmp/esdb_logs.tar.gz", "/tmp/esdb_logs.tar.gz");
} else {
logger().warn("Failed to compress logs: {}", result.getStderr());
}
} else {
logger().warn("No log directory found at /var/log/eventstore or /var/log/kurrentdb, skipping log collection");
}
} catch (Exception logException) {
logger().warn("Could not collect container logs (this is not critical): {}", logException.getMessage());
}
copyFileFromContainer("/tmp/esdb_logs.tar.gz", "/tmp/esdb_logs.tar.gz");
} catch (Exception e) {
logger().error("Error when cleanup docker container", e);
} finally {
Expand Down
Loading