apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-12 14:18:03 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Use system out for build log and sys err for in progress display, fixes #822 (#824)

Browse Source
This commit is contained in:
Guillaume Nodet
2023-03-21 14:33:51 +01:00
committed by GitHub
parent 56435a05f6
commit 89e41a23ec
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java
View File

@@ -39,7 +39,6 @@ import java.util.function.Consumer;
import java.util.stream.Collector; import java.util.stream.Collector;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.fusesource.jansi.internal.CLibrary;
import org.jline.terminal.Size; import org.jline.terminal.Size;
import org.jline.terminal.Terminal; import org.jline.terminal.Terminal;
import org.jline.terminal.TerminalBuilder; import org.jline.terminal.TerminalBuilder;
@@ -158,10 +157,7 @@ public class TerminalOutput implements ClientOutput {
public TerminalOutput(boolean noBuffering, int rollingWindowSize, Path logFile) throws IOException { public TerminalOutput(boolean noBuffering, int rollingWindowSize, Path logFile) throws IOException {
this.start = System.currentTimeMillis(); this.start = System.currentTimeMillis();
TerminalBuilder builder = TerminalBuilder.builder(); TerminalBuilder builder = TerminalBuilder.builder();
boolean outRedirected = CLibrary.isatty(1) == 0; builder.systemOutput(TerminalBuilder.SystemOutput.SysErr);
if (outRedirected) {
builder.dumb(true);
}
this.terminal = builder.build(); this.terminal = builder.build();
this.dumb = terminal.getType().startsWith("dumb"); this.dumb = terminal.getType().startsWith("dumb");
this.noBuffering = noBuffering; this.noBuffering = noBuffering;
@@ -933,7 +929,7 @@ public class TerminalOutput implements ClientOutput {
@Override @Override
public void flush() { public void flush() {
clearDisplay(); clearDisplay();
messages.forEach(terminal.writer()::println); messages.forEach(System.out::println);
messages.clear(); messages.clear();
terminal.flush(); terminal.flush();
} }