From 39be274a446bc48400fb0f4ff8ec74b54883f7a6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 12 Feb 2014 10:55:00 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java | 94 ++++++++++++++++++-----------------------------
1 files changed, 36 insertions(+), 58 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
index 06633a4..d8feb07 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
@@ -28,8 +28,19 @@
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.tools.ToolConstants.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.forgerock.i18n.LocalizableMessage;
+import org.opends.server.admin.std.server.BackendCfg;
import org.opends.server.api.Backend;
-import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.opends.server.backends.jeb.BackendImpl;
import org.opends.server.backends.jeb.VerifyConfig;
import org.opends.server.config.ConfigException;
@@ -37,15 +48,11 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.extensions.ConfigFileHandler;
-import org.opends.server.loggers.DebugLogPublisher;
-import org.opends.server.loggers.DebugLogger;
-import org.opends.server.loggers.ErrorLogPublisher;
-import org.opends.server.loggers.TextDebugLogPublisher;
-import org.opends.server.loggers.TextWriter;
-import org.opends.server.loggers.ErrorLogger;
-import org.opends.server.loggers.TextErrorLogPublisher;
-import org.opends.server.loggers.TraceSettings;
-import org.opends.server.types.*;
+import org.opends.server.loggers.JDKLogging;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.NullOutputStream;
import org.opends.server.util.BuildVersion;
import com.forgerock.opendj.cli.ArgumentException;
@@ -53,21 +60,6 @@
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.StringArgument;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.opends.messages.ToolMessages.*;
-
-import org.forgerock.i18n.LocalizableMessage;
-
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-import static org.opends.server.tools.ToolConstants.*;
-
-import org.opends.server.admin.std.server.BackendCfg;
-
/**
* This program provides a utility to verify the contents of the indexes
@@ -78,8 +70,6 @@
public class VerifyIndex
{
- private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
/**
* Processes the command-line arguments and invokes the verify process.
*
@@ -114,6 +104,7 @@
{
PrintStream out = NullOutputStream.wrapOrNullStream(outStream);
PrintStream err = NullOutputStream.wrapOrNullStream(errStream);
+ JDKLogging.disableLogging();
// Define the command-line arguments that may be used with this program.
StringArgument configClass = null;
@@ -367,29 +358,8 @@
err.println(wrapText(message, MAX_LINE_WIDTH));
return 1;
}
-
-
- try
- {
- ErrorLogPublisher errorLogPublisher =
- TextErrorLogPublisher.getToolStartupTextErrorPublisher(
- new TextWriter.STREAM(out));
- DebugLogPublisher debugLogPublisher =
- TextDebugLogPublisher.getStartupTextDebugPublisher(
- new TextWriter.STREAM(out));
- debugLogPublisher.addTraceSettings(null,
- new TraceSettings());
- ErrorLogger.getInstance().addLogPublisher(errorLogPublisher);
- DebugLogger.getInstance().addLogPublisher(debugLogPublisher);
- }
- catch(Exception e)
- {
- err.println("Error installing the custom error logger: " +
- stackTraceToSingleLineString(e));
- }
}
-
// Decode the base DN provided by the user.
DN verifyBaseDN ;
try
@@ -398,12 +368,14 @@
}
catch (DirectoryException de)
{
- logger.error(ERR_CANNOT_DECODE_BASE_DN, baseDNString.getValue(), de.getMessageObject());
+ err.println(wrapText(ERR_CANNOT_DECODE_BASE_DN.get(baseDNString.getValue(),
+ de.getMessageObject()), MAX_LINE_WIDTH));
return 1;
}
catch (Exception e)
{
- logger.error(ERR_CANNOT_DECODE_BASE_DN, baseDNString.getValue(), getExceptionMessage(e));
+ err.println(wrapText(ERR_CANNOT_DECODE_BASE_DN.get(baseDNString.getValue(),
+ getExceptionMessage(e)), MAX_LINE_WIDTH));
return 1;
}
@@ -433,7 +405,7 @@
}
else
{
- logger.error(ERR_MULTIPLE_BACKENDS_FOR_BASE, baseDNString.getValue());
+ err.println(wrapText(ERR_MULTIPLE_BACKENDS_FOR_BASE.get(baseDNString.getValue()), MAX_LINE_WIDTH));
return 1;
}
break;
@@ -443,13 +415,13 @@
if (backend == null)
{
- logger.error(ERR_NO_BACKENDS_FOR_BASE, baseDNString.getValue());
+ err.println(wrapText(ERR_NO_BACKENDS_FOR_BASE.get(baseDNString.getValue()), MAX_LINE_WIDTH));
return 1;
}
if (!(backend instanceof BackendImpl))
{
- logger.error(ERR_BACKEND_NO_INDEXING_SUPPORT);
+ err.println(wrapText(ERR_BACKEND_NO_INDEXING_SUPPORT.get(), MAX_LINE_WIDTH));
return 1;
}
@@ -479,13 +451,15 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
{
- logger.error(ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND, backend.getBackendID(), failureReason);
+ err.println(wrapText(ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND.get(backend.getBackendID(),
+ failureReason), MAX_LINE_WIDTH));
return 1;
}
}
catch (Exception e)
{
- logger.error(ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
+ err.println(wrapText(ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND.get(backend.getBackendID(),
+ getExceptionMessage(e)), MAX_LINE_WIDTH));
return 1;
}
@@ -510,7 +484,8 @@
}
catch (Exception e)
{
- logger.error(ERR_VERIFYINDEX_ERROR_DURING_VERIFY, stackTraceToSingleLineString(e));
+ err.println(wrapText(ERR_VERIFYINDEX_ERROR_DURING_VERIFY.get(stackTraceToSingleLineString(e)),
+ MAX_LINE_WIDTH));
returnCode = 1;
}
@@ -522,14 +497,17 @@
StringBuilder failureReason = new StringBuilder();
if (! LockFileManager.releaseLock(lockFile, failureReason))
{
- logger.warn(WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), failureReason);
+ err.println(wrapText(WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(),
+ failureReason), MAX_LINE_WIDTH));
}
}
catch (Exception e)
{
- logger.warn(WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), getExceptionMessage(e));
+ err.println(wrapText(WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(),
+ getExceptionMessage(e)), MAX_LINE_WIDTH));
}
return returnCode;
}
}
+
--
Gitblit v1.10.0