From e2a419a870b9f64f848c019e8fe91c5bd870b136 Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Thu, 11 Feb 2021 10:30:34 +0100
Subject: [PATCH] Add a a few debug entries to help diagnosing test failures

---
 .../java/org/mvndaemon/mvnd/client/DaemonConnector.java  | 3 +++
 .../java/org/mvndaemon/mvnd/common/DaemonConnection.java | 2 +-
 .../src/main/java/org/mvndaemon/mvnd/common/Message.java | 9 +++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
index d861919c..ae8a7591 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
@@ -222,6 +222,7 @@ public class DaemonConnector {
 
     private DaemonClientConnection connectToIdleDaemon(Collection<DaemonInfo> idleDaemons, DaemonCompatibilitySpec constraint) {
         final List<DaemonInfo> compatibleIdleDaemons = getCompatibleDaemons(idleDaemons, constraint);
+        LOGGER.debug("Found {} idle daemons, {} compatibles", idleDaemons.size(), compatibleIdleDaemons.size());
         return findConnection(compatibleIdleDaemons);
     }
 
@@ -232,6 +233,8 @@ public class DaemonConnector {
                 .collect(Collectors.groupingBy(di -> di.getState() == Canceled));
         final Collection<DaemonInfo> compatibleCanceledDaemons = getCompatibleDaemons(
                 canceledBusy.getOrDefault(true, Collections.emptyList()), constraint);
+        LOGGER.debug("Found {} busy daemons, {} cancelled, {} compatibles", busyDaemons.size(), canceledBusy.size(),
+                compatibleCanceledDaemons.size());
         if (!compatibleCanceledDaemons.isEmpty()) {
             LOGGER.debug("Waiting for daemons with canceled builds to become available");
             long start = System.currentTimeMillis();
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/DaemonConnection.java b/common/src/main/java/org/mvndaemon/mvnd/common/DaemonConnection.java
index cb7bb119..9c50e7f2 100755
--- a/common/src/main/java/org/mvndaemon/mvnd/common/DaemonConnection.java
+++ b/common/src/main/java/org/mvndaemon/mvnd/common/DaemonConnection.java
@@ -75,7 +75,7 @@ public class DaemonConnection implements AutoCloseable {
             return Message.read(input);
         } catch (EOFException e) {
             if (LOGGER.isDebugEnabled()) {
-                LOGGER.debug("Discarding EOFException: {}", e.toString());
+                LOGGER.debug("Discarding EOFException: {}", e.toString(), e);
             }
             return null;
         } catch (IOException e) {
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/Message.java b/common/src/main/java/org/mvndaemon/mvnd/common/Message.java
index 09d96342..f9f865e1 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/Message.java
+++ b/common/src/main/java/org/mvndaemon/mvnd/common/Message.java
@@ -29,7 +29,7 @@ import java.util.Map;
 import java.util.Objects;
 
 public abstract class Message {
-    public static final int BUILD_REQUEST = 0;
+    public static final int BUILD_REQUEST = 23;
     public static final int BUILD_STARTED = 1;
     public static final int BUILD_FINISHED = 2;
     /** A {@link StringMessage} bearing the {@code artifactId} of the project whose build just started */
@@ -67,7 +67,7 @@ public abstract class Message {
 
     public static Message read(DataInputStream input) throws IOException {
         int type = input.read();
-        if (type == -1) {
+        if (type < 0) {
             return null;
         }
         switch (type) {
@@ -319,7 +319,8 @@ public abstract class Message {
         final int exitCode;
 
         public static Message read(DataInputStream input) throws IOException {
-            return new BuildFinished(input.readInt());
+            int exitCode = input.readInt();
+            return new BuildFinished(exitCode);
         }
 
         public BuildFinished(int exitCode) {
@@ -329,7 +330,7 @@ public abstract class Message {
 
         @Override
         public String toString() {
-            return "BuildRequest{exitCode=" + exitCode + '}';
+            return "BuildFinished{exitCode=" + exitCode + '}';
         }
 
         @Override