From 1d5d1a6a4a0a58d6bb4803527dacb6641c027816 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 28 Jan 2014 13:34:12 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java | 49 ++++++++++++++++++++++++-------------------------
1 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java
index b88af60..3af5873 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java
@@ -44,8 +44,8 @@
import java.util.ArrayList;
import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.IOException;
@@ -55,8 +55,7 @@
*/
public class ServerController {
- static private final Logger LOG =
- Logger.getLogger(ServerController.class.getName());
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private Application application;
@@ -145,7 +144,7 @@
mb.append(application.getLineBreak());
application.notifyListeners(mb.toMessage());
}
- LOG.log(Level.INFO, "stopping server");
+ logger.debug(LocalizableMessage.raw("stopping server"));
ArrayList<String> argList = new ArrayList<String>();
argList.add(Utils.getScriptPath(
@@ -167,19 +166,19 @@
env.remove(SetupUtils.OPENDJ_JAVA_ARGS);
env.remove("CLASSPATH");
- LOG.log(Level.INFO, "Before calling stop-ds. Is server running? "+
- installation.getStatus().isServerRunning());
+ logger.debug(LocalizableMessage.raw("Before calling stop-ds. Is server running? "+
+ installation.getStatus().isServerRunning()));
int stopTries = 3;
while (stopTries > 0)
{
stopTries --;
- LOG.log(Level.INFO, "Launching stop command, stopTries left: "+
- stopTries);
+ logger.debug(LocalizableMessage.raw("Launching stop command, stopTries left: "+
+ stopTries));
try
{
- LOG.log(Level.INFO, "Launching stop command, argList: "+argList);
+ logger.debug(LocalizableMessage.raw("Launching stop command, argList: "+argList));
Process process = pb.start();
BufferedReader err =
@@ -211,7 +210,7 @@
boolean stopped = false;
for (int i = 0; i < nTries && !stopped; i++) {
- LOG.log(Level.FINE, "waiting for server to stop");
+ logger.trace("waiting for server to stop");
try {
Thread.sleep(5000);
}
@@ -220,8 +219,8 @@
// do nothing
}
stopped = !installation.getStatus().isServerRunning();
- LOG.log(Level.INFO,
- "After calling stop-ds. Is server running? "+!stopped);
+ logger.debug(LocalizableMessage.raw(
+ "After calling stop-ds. Is server running? "+!stopped));
if (!stopped) {
if (application != null) {
@@ -250,7 +249,7 @@
mb.append(application.getLineBreak());
application.notifyListeners(mb.toMessage());
}
- LOG.log(Level.INFO, "server already stopped");
+ logger.debug(LocalizableMessage.raw("server already stopped"));
break;
} else if (returnValue != 0) {
if (stopTries <= 0)
@@ -270,7 +269,7 @@
application.notifyListeners(application.getFormattedLog(
INFO_PROGRESS_SERVER_STOPPED.get()));
}
- LOG.log(Level.INFO, "server stopped");
+ logger.debug(LocalizableMessage.raw("server stopped"));
break;
}
@@ -341,7 +340,7 @@
mb.append(application.getLineBreak());
application.notifyListeners(mb.toMessage());
}
- LOG.log(Level.INFO, "starting server");
+ logger.debug(LocalizableMessage.raw("starting server"));
ArrayList<String> argList = new ArrayList<String>();
argList.add(Utils.getScriptPath(
@@ -376,7 +375,7 @@
int returnValue = process.waitFor();
- LOG.log(Level.INFO, "start-ds return value: "+returnValue);
+ logger.debug(LocalizableMessage.raw("start-ds return value: "+returnValue));
if (returnValue != 0)
{
@@ -386,15 +385,15 @@
}
if (outputReader.isFinished())
{
- LOG.log(Level.INFO, "Output reader finished.");
+ logger.debug(LocalizableMessage.raw("Output reader finished."));
}
if (errReader.isFinished())
{
- LOG.log(Level.INFO, "Error reader finished.");
+ logger.debug(LocalizableMessage.raw("Error reader finished."));
}
if (!outputReader.startedIdFound() && !errReader.startedIdFound())
{
- LOG.log(Level.WARNING, "Started ID could not be found");
+ logger.warn(LocalizableMessage.raw("Started ID could not be found"));
}
// Check if something wrong occurred reading the starting of the server
@@ -488,7 +487,7 @@
}
catch (NamingException ne)
{
- LOG.log(Level.WARNING, "Could not connect to server: "+ne, ne);
+ logger.warn(LocalizableMessage.raw("Could not connect to server: "+ne, ne));
}
finally
{
@@ -605,7 +604,7 @@
application.notifyListeners(buf.toMessage());
isFirstLine = false;
}
- LOG.log(Level.INFO, "server: " + line);
+ logger.debug(LocalizableMessage.raw("server: " + line));
line = reader.readLine();
}
} catch (Throwable t) {
@@ -613,7 +612,7 @@
LocalizableMessage errorMsg = getThrowableMsg(errorTag, t);
application.notifyListeners(errorMsg);
}
- LOG.log(Level.INFO, "error reading server messages",t);
+ logger.debug(LocalizableMessage.raw("error reading server messages",t));
}
}
});
@@ -695,7 +694,7 @@
application.notifyListeners(buf.toMessage());
isFirstLine = false;
}
- LOG.log(Level.INFO, "server: " + line);
+ logger.debug(LocalizableMessage.raw("server: " + line));
if (line.toLowerCase().contains("=" + startedId))
{
isFinished = true;
@@ -705,7 +704,7 @@
}
} catch (Throwable t)
{
- LOG.log(Level.WARNING, "Error reading output: "+t, t);
+ logger.warn(LocalizableMessage.raw("Error reading output: "+t, t));
ex = new ApplicationException(
ReturnCode.START_ERROR,
getThrowableMsg(errorTag, t), t);
--
Gitblit v1.10.0