From 1f164e01309bb6f2bdf7ad3e0dc9f8ec969e63b0 Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Wed, 19 Mar 2008 22:31:09 +0000
Subject: [PATCH] Fixed a issue created in revision 3977 where messages are printed twice when running some tools (import-ldif, verif y-index, etc...)
---
opendj-sdk/opends/src/server/org/opends/server/tools/RebuildIndex.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/RebuildIndex.java b/opendj-sdk/opends/src/server/org/opends/server/tools/RebuildIndex.java
index c4cc2f3..7390896 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/RebuildIndex.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/RebuildIndex.java
@@ -37,9 +37,11 @@
import static org.opends.messages.ToolMessages.*;
import org.opends.server.config.ConfigException;
import static org.opends.server.loggers.ErrorLogger.logError;
-import org.opends.server.loggers.ThreadFilterTextErrorLogPublisher;
import org.opends.server.loggers.TextWriter;
import org.opends.server.loggers.ErrorLogger;
+import org.opends.server.loggers.TextErrorLogPublisher;
+import org.opends.server.loggers.debug.TextDebugLogPublisher;
+import org.opends.server.loggers.debug.DebugLogger;
import static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import org.opends.server.core.DirectoryServer;
@@ -48,6 +50,7 @@
import org.opends.server.types.*;
import org.opends.server.api.Backend;
import org.opends.server.api.ErrorLogPublisher;
+import org.opends.server.api.DebugLogPublisher;
import org.opends.server.backends.jeb.BackendImpl;
import org.opends.server.backends.jeb.RebuildConfig;
import org.opends.server.admin.std.server.BackendCfg;
@@ -66,7 +69,6 @@
*/
public class RebuildIndex
{
- private static ErrorLogPublisher errorLogPublisher = null;
/**
* Processes the command-line arguments and invokes the rebuild process.
@@ -77,11 +79,6 @@
{
int retCode = mainRebuildIndex(args, true, System.out, System.err);
- if(errorLogPublisher != null)
- {
- ErrorLogger.removeErrorLogPublisher(errorLogPublisher);
- }
-
if(retCode != 0)
{
System.exit(filterExitCode(retCode));
@@ -357,15 +354,16 @@
- // FIXME -- Install a custom logger to capture information about the state
- // of the verify process.
try
{
- errorLogPublisher =
- new ThreadFilterTextErrorLogPublisher(Thread.currentThread(),
- new TextWriter.STREAM(out));
+ ErrorLogPublisher errorLogPublisher =
+ TextErrorLogPublisher.getStartupTextErrorPublisher(
+ new TextWriter.STREAM(out));
+ DebugLogPublisher debugLogPublisher =
+ TextDebugLogPublisher.getStartupTextDebugPublisher(
+ new TextWriter.STREAM(out));
ErrorLogger.addErrorLogPublisher(errorLogPublisher);
-
+ DebugLogger.addDebugLogPublisher(debugLogPublisher);
}
catch(Exception e)
{
--
Gitblit v1.10.0