From bc0af9aaaf07eef4ef9d3fd762344244d63d08ca Mon Sep 17 00:00:00 2001
From: Peter Palaga <ppalaga@redhat.com>
Date: Fri, 13 Nov 2020 11:37:19 +0100
Subject: [PATCH] Messages associated with projectId from the previous build in
 the terminal and daemon log #216

---
 daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
index e34ee431..c5732800 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
@@ -58,8 +58,10 @@ import org.mvndaemon.mvnd.common.Message.BuildStarted;
 import org.mvndaemon.mvnd.daemon.DaemonExpiration.DaemonExpirationResult;
 import org.mvndaemon.mvnd.daemon.DaemonExpiration.DaemonExpirationStrategy;
 import org.mvndaemon.mvnd.logging.smart.AbstractLoggingSpy;
+import org.mvndaemon.mvnd.logging.smart.ProjectBuildLogAppender;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
 import sun.misc.Signal;
 import sun.misc.SignalHandler;
 
@@ -539,6 +541,7 @@ public class Server implements AutoCloseable, Runnable {
                 loggingSpy.fail(t);
             } finally {
                 sender.join();
+                MDC.remove(ProjectBuildLogAppender.KEY_PROJECT_ID);
             }
         } catch (Throwable t) {
             LOGGER.error("Error while building project", t);