SONAR-5409 - Coherent logs for process monitoring

3 files changed, 4 insertions, 5 deletions

diff --git a/server/sonar-process/src/main/java/org/sonar/process/MonitorService.java b/server/sonar-process/src/main/java/org/sonar/process/MonitorService.java
index 219fb64e332..396f24163f1 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/MonitorService.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/MonitorService.java
@@ -51,7 +51,7 @@ public class MonitorService extends Thread {
 
   @Override
   public void run() {
-    LOGGER.info("Launching Monitoring Thread");
+    LOGGER.info("Starting monitoring for {} processes.", processes.size());
     long time;
     while (!Thread.currentThread().isInterrupted()) {
       DatagramPacket packet = new DatagramPacket(new byte[1024], 1024);
@@ -68,7 +68,6 @@ public class MonitorService extends Thread {
         break;
       }
     }
-    LOGGER.error("Not all process have checked-in. Aborting node");
     for (ProcessWrapper process : processes.values()) {
       process.shutdown();
     }
diff --git a/server/sonar-process/src/main/java/org/sonar/process/Process.java b/server/sonar-process/src/main/java/org/sonar/process/Process.java
index bd05ec876c9..d1070c3c138 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/Process.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/Process.java
@@ -85,7 +85,7 @@ public abstract class Process implements Runnable {
 
   @Override
   public void run() {
-    LOGGER.info("Setting up heartbeat on port '{}'", port);
+    LOGGER.debug("Setting up heartbeat on port '{}'", port);
     try {
       byte[] data = name.getBytes();
       DatagramPacket pack =
@@ -104,6 +104,5 @@ public abstract class Process implements Runnable {
     } catch (IOException e) {
       throw new IllegalStateException("Heartbeat Thread for " + name + " could not communicate to socket", e);
     }
-    System.out.println("Closing  application");
   }
 }
\ No newline at end of file
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
index 0fadc4d5190..74b6ad43850 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
@@ -41,7 +41,7 @@ public class ProcessWrapper extends Thread {
 
   public ProcessWrapper(String className, String[] classPath, Map<String, String> properties, String name, Integer port) {
     super(name);
-    LOGGER.info("Creating Launcher for '{}' with base port: {}", name, port);
+    LOGGER.info("Creating Process for '{}' with monitoring port: {}", name, port);
     this.port = port;
     this.className = className;
     this.classPath = classPath;
@@ -74,6 +74,7 @@ public class ProcessWrapper extends Thread {
   }
 
   public void shutdown() {
+    LOGGER.info("Shutting down '{}'", this.getName());
     this.interrupt();
     this.process.destroy();
   }