chore: Disable color logging when writing integration logs to dump file

citrusframework · Jun 13, 2024 · 8134237 · 8134237
1 parent fb30c57
commit 8134237
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/java/steps/yaks-camel-k/src/main/java/org/citrusframework/yaks/camelk/jbang/CamelJBang.java b/java/steps/yaks-camel-k/src/main/java/org/citrusframework/yaks/camelk/jbang/CamelJBang.java
@@ -40,6 +40,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -114,6 +115,12 @@ public ProcessAndOutput run(String name, String file, String... args) {
         if (CamelJBangSettings.isCamelDumpIntegrationOutput()) {
             Path workDir = CamelJBangSettings.getWorkDir();
             File outputFile = workDir.resolve(String.format("i-%s-output.txt", name)).toFile();
+
+            if (Stream.of(args).noneMatch(it -> it.contains("--logging-color"))) {
+                // disable logging colors when writing logs to file
+                runArgs.add("--logging-color=false");
+            }
+
             return executeAsync(camel(runArgs.toArray(String[]::new)), outputFile);
         } else {
             return executeAsync(camel(runArgs.toArray(String[]::new)));

diff --git a/...ps/yaks-camel-k/src/main/java/org/citrusframework/yaks/camelk/jbang/ProcessAndOutput.java b/...ps/yaks-camel-k/src/main/java/org/citrusframework/yaks/camelk/jbang/ProcessAndOutput.java
@@ -86,7 +86,7 @@ private void readAllAndClose() {
                 builder.append(line).append(System.lineSeparator());
             }
 
-            if (builder.length() > 0) {
+            if (!builder.isEmpty()) {
                 output += builder;
             }
         } catch (IOException e) {
@@ -124,7 +124,7 @@ private void readChunk() {
             throw new CitrusRuntimeException("Failed to get JBang process output", e);
         }
 
-        if (builder.length() > 0) {
+        if (!builder.isEmpty()) {
             if (output == null) {
                 output = builder.toString();
             } else {