From e24f76490ae02b8138ad76bce61035132a3ef9a9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Lesaint?=
 <sebastien.lesaint@sonarsource.com>
Date: Mon, 11 Jan 2016 09:33:34 +0100
Subject: [PATCH] SONAR-7168 replace System.err with LOG.trace in Monitor and
 Lifecycle

---
 .../main/java/org/sonar/process/monitor/Monitor.java | 12 ++++++++----
 .../src/main/java/org/sonar/process/Lifecycle.java   |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java
index 7dcf8ede0d0..e2e50bb0724 100644
--- a/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java
+++ b/server/sonar-process-monitor/src/main/java/org/sonar/process/monitor/Monitor.java
@@ -158,9 +158,9 @@ public class Monitor {
 
   boolean waitForOneRestart() {
     boolean restartRequested = awaitChildProcessesTermination();
-    trace("finished waiting, restartRequested=" + restartRequested);
+    trace("finished waiting, restartRequested={}", restartRequested);
     if (restartRequested) {
-      trace("awaitTermination(restartor)=" + restartor);
+      trace("awaitTermination restartor={}", restartor);
       awaitTermination(restartor);
     }
     return restartRequested;
@@ -203,7 +203,7 @@ public class Monitor {
   private void cleanAfterTermination() {
     trace("go to STOPPED...");
     if (lifecycle.tryToMoveTo(State.STOPPED)) {
-      trace("await termination of restartWatcher...");
+      trace("await termination of restartWatcher and hardStopWatcher...");
       // wait for restartWatcher and hardStopWatcher to cleanly stop
       awaitTermination(restartWatcher, hardStopWatcher);
       trace("restartWatcher done");
@@ -406,7 +406,11 @@ public class Monitor {
   }
 
   private static void trace(String s) {
-    System.err.println("APP: " + s);
+    LOG.trace(s);
+  }
+
+  private static void trace(String s, Object args) {
+    LOG.trace(s, args);
   }
 
   public static int getNextProcessId() {
diff --git a/server/sonar-process/src/main/java/org/sonar/process/Lifecycle.java b/server/sonar-process/src/main/java/org/sonar/process/Lifecycle.java
index 18a747e14e4..5d570c70e5a 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/Lifecycle.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/Lifecycle.java
@@ -82,7 +82,7 @@ public class Lifecycle {
       this.state = to;
       res = true;
     }
-    LOG.info("tryToMoveTo from {} to {} => {}", currentState, to, res);
+    LOG.trace("tryToMoveTo from {} to {} => {}", currentState, to, res);
     return res;
   }
 
-- 
2.39.5