Skip to content

Improve logging of maven dependency:copy command to avoid hang during re-run for error message #68

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

Merged
gdgib merged 2 commits into from
Feb 19, 2025
Merged

Improve logging of maven dependency:copy command to avoid hang during re-run for error message #68

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c326dbf
Improve logging of maven dependency:copy command to avoid hang during…
Feb 18, 2025
190276f
Merge branch 'master' into MavenRepoHang
Feb 19, 2025
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
14 changes: 8 additions & 6 deletions re-maven/src/main/java/com/g2forge/reassert/maven/MavenRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import com.fasterxml.jackson.module.paranamer.ParanamerModule;
import com.g2forge.alexandria.adt.graph.v1.HGraph;
import com.g2forge.alexandria.java.core.enums.EnumException;
import com.g2forge.alexandria.java.core.error.UnreachableCodeError;
import com.g2forge.alexandria.java.core.helpers.HCollection;
import com.g2forge.alexandria.java.function.IFunction1;
import com.g2forge.alexandria.java.function.ISupplier;
Expand All @@ -27,6 +26,7 @@
import com.g2forge.alexandria.service.BasicServiceLoader;
import com.g2forge.alexandria.service.DefaultInstantiator;
import com.g2forge.gearbox.command.process.IProcess;
import com.g2forge.gearbox.command.proxy.result.StreamResultSupplier;
import com.g2forge.gearbox.maven.HMaven;
import com.g2forge.gearbox.maven.IMaven;
import com.g2forge.gearbox.maven.MavenDownloadErrors;
Expand Down Expand Up @@ -147,14 +147,16 @@ protected Path download(MavenCoordinates coordinates, Path path) {
Files.newOutputStream(path, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE).close();
} else {
if (!process.isSuccess()) {
// Re-run the command so that we log the complete output
command.get().assertSuccess();
boolean rerunFailed;
try {
// Fail (again) just in case the re-run succeeded somehow, which would be REALLY weird
process.assertSuccess();
// Re-run the command so that we log the complete output
log.error("Maven dependency copy failed, running again to log output:");
StreamResultSupplier.STANDARD.apply(command.get()).forEach(log::error);
rerunFailed = false;
} catch (Throwable throwable) {
throw new UnreachableCodeError(throwable);
rerunFailed = true;
}
if (!rerunFailed) throw new Error("This error indicates that the maven dependency copy failed once, and succeeded on re-run. Perhaps a transient network failure? Try re-running this.");
}
Files.move(path.getParent().resolve(coordinates.getArtifactId() + "-" + coordinates.getVersion() + ".pom"), path);
}
Expand Down