Prompter prompt should not prepend the projectId when there's only on…

…e project, fixes apache#816 Also make sure the daemon prompter log only goes to the daemon log
gnodet · Mar 14, 2023 · 39e1da2 · 39e1da2
1 parent e1815e5
commit 39e1da2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java b/common/src/main/java/org/mvndaemon/mvnd/common/logging/TerminalOutput.java
@@ -350,7 +350,10 @@ private boolean doAccept(Message entry) {
                 readInput.writeLock().lock();
                 try {
                     clearDisplay();
-                    terminal.writer().printf("[%s] %s", prompt.getProjectId(), prompt.getMessage());
+                    String msg = (maxThreads > 1)
+                            ? String.format("[%s] %s", prompt.getProjectId(), prompt.getMessage())
+                            : prompt.getMessage();
+                    terminal.writer().print(msg);
                     terminal.flush();
                     StringBuilder sb = new StringBuilder();
                     while (true) {

diff --git a/dist/src/main/distro/mvn/conf/logging/logback-daemon.xml b/dist/src/main/distro/mvn/conf/logging/logback-daemon.xml
@@ -36,6 +36,10 @@
     <appender-ref ref="DAEMON" />
   </logger>
 
+  <logger name="org.mvndaemon.mvnd.interactivity" level="DEBUG" additivity="false">
+    <appender-ref ref="DAEMON" />
+  </logger>
+
   <logger name="Sisu" level="INFO" />
 
   <!-- suppress annoying @threadSafe and checksum failure warning messages -->