Improve logging in native image builder

quarkusio · Feb 24, 2021 · 7319acc · 7319acc
1 parent a8969db
commit 7319acc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/.../src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRemoteContainerRunner.java b/.../src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRemoteContainerRunner.java
@@ -6,6 +6,8 @@
 import java.nio.file.Path;
 import java.util.List;
 
+import org.jboss.logging.Logger;
+
 import io.quarkus.deployment.pkg.NativeConfig;
 
 public class NativeImageBuildRemoteContainerRunner extends NativeImageBuildContainerRunner {
@@ -19,19 +21,21 @@ public NativeImageBuildRemoteContainerRunner(NativeConfig nativeConfig, Path out
     }
 
     @Override
-    protected void preBuild(List<String> buildArgs) throws InterruptedException, IOException {
+    protected void preBuild(Logger log, List<String> buildArgs) throws InterruptedException, IOException {
         List<String> containerRuntimeArgs = getContainerRuntimeBuildArgs();
         String[] createContainerCommand = buildCommand("create", containerRuntimeArgs, buildArgs);
+        log.info(String.join(" ", createContainerCommand).replace("$", "\\$"));
         Process createContainerProcess = new ProcessBuilder(createContainerCommand).start();
         createContainerProcess.waitFor();
         try (BufferedReader reader = new BufferedReader(new InputStreamReader(createContainerProcess.getInputStream()))) {
             containerId = reader.readLine();
         }
         String[] copyCommand = new String[] { containerRuntime.getExecutableName(), "cp", outputPath + "/.",
                 containerId + ":" + NativeImageBuildStep.CONTAINER_BUILD_VOLUME_PATH };
+        log.info(String.join(" ", copyCommand).replace("$", "\\$"));
         Process copyProcess = new ProcessBuilder(copyCommand).start();
         copyProcess.waitFor();
-        super.preBuild(buildArgs);
+        super.preBuild(log, buildArgs);
     }
 
     @Override
@@ -40,18 +44,20 @@ protected String[] getBuildCommand(List<String> args) {
     }
 
     @Override
-    protected void postBuild() throws InterruptedException, IOException {
-        copy(nativeImageName);
-        copy("sources");
+    protected void postBuild(Logger log) throws InterruptedException, IOException {
+        copy(log, nativeImageName);
+        copy(log, "sources");
         String[] removeCommand = new String[] { containerRuntime.getExecutableName(), "container", "rm", "--volumes",
                 containerId };
+        log.info(String.join(" ", removeCommand).replace("$", "\\$"));
         Process removeProcess = new ProcessBuilder(removeCommand).start();
         removeProcess.waitFor();
     }
 
-    private void copy(String path) throws IOException, InterruptedException {
+    private void copy(Logger log, String path) throws IOException, InterruptedException {
         String[] copyCommand = new String[] { containerRuntime.getExecutableName(), "cp",
                 containerId + ":" + NativeImageBuildStep.CONTAINER_BUILD_VOLUME_PATH + "/" + path, outputPath };
+        log.info(String.join(" ", copyCommand).replace("$", "\\$"));
         Process copyProcess = new ProcessBuilder(copyCommand).start();
         copyProcess.waitFor();
     }

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunner.java
@@ -12,6 +12,8 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import org.jboss.logging.Logger;
+
 import io.quarkus.deployment.pkg.steps.NativeImageBuildStep.GraalVM;
 import io.quarkus.deployment.util.ProcessUtil;
 
@@ -41,13 +43,15 @@ public void setup(boolean processInheritIODisabled) {
     public void cleanupServer(File outputDir, boolean processInheritIODisabled) throws InterruptedException, IOException {
     }
 
-    public int build(List<String> args, Path outputDir, boolean processInheritIODisabled)
+    public int build(List<String> args, Logger log, Path outputDir, boolean processInheritIODisabled)
             throws InterruptedException, IOException {
-        preBuild(args);
+        preBuild(log, args);
         try {
             CountDownLatch errorReportLatch = new CountDownLatch(1);
-            final ProcessBuilder processBuilder = new ProcessBuilder(getBuildCommand(args))
+            final String[] buildCommand = getBuildCommand(args);
+            final ProcessBuilder processBuilder = new ProcessBuilder(buildCommand)
                     .directory(outputDir.toFile());
+            log.info(String.join(" ", buildCommand).replace("$", "\\$"));
             final Process process = ProcessUtil.launchProcessStreamStdOut(processBuilder, processInheritIODisabled);
             ExecutorService executor = Executors.newSingleThreadExecutor();
             executor.submit(new ErrorReplacingProcessReader(process.getErrorStream(), outputDir.resolve("reports").toFile(),
@@ -56,18 +60,18 @@ public int build(List<String> args, Path outputDir, boolean processInheritIODisa
             errorReportLatch.await();
             return process.waitFor();
         } finally {
-            postBuild();
+            postBuild(log);
         }
     }
 
     protected abstract String[] getGraalVMVersionCommand(List<String> args);
 
     protected abstract String[] getBuildCommand(List<String> args);
 
-    protected void preBuild(List<String> buildArgs) throws IOException, InterruptedException {
+    protected void preBuild(Logger log, List<String> buildArgs) throws IOException, InterruptedException {
     }
 
-    protected void postBuild() throws InterruptedException, IOException {
+    protected void postBuild(Logger log) throws InterruptedException, IOException {
     }
 
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
@@ -175,8 +175,7 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa
 
             List<String> nativeImageArgs = commandAndExecutable.args;
 
-            log.info(String.join(" ", nativeImageArgs).replace("$", "\\$"));
-            int exitCode = buildRunner.build(nativeImageArgs, outputDir, processInheritIODisabled.isPresent());
+            int exitCode = buildRunner.build(nativeImageArgs, log, outputDir, processInheritIODisabled.isPresent());
             if (exitCode != 0) {
                 throw imageGenerationFailed(exitCode, nativeImageArgs);
             }