From 4d24010f558500f929f1d947c72eaecd5af25027 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Tue, 14 Mar 2023 10:02:12 +0100
Subject: [PATCH] Prompter prompt should not prepend the projectId when there's
 only one project, fixes #816

Also make sure the daemon prompter log only goes to the daemon log
---
 .../org/mvndaemon/mvnd/common/logging/TerminalOutput.java    | 5 ++++-
 dist/src/main/distro/mvn/conf/logging/logback-daemon.xml     | 4 ++++
 2 files changed, 8 insertions(+), 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
index 4e1ddc32..5ca059d8 100644
--- 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 @@ public class TerminalOutput implements ClientOutput {
                 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
index 3fa5f26d..97a6053b 100644
--- 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 -->