From 94502a1fdf41451d43080e1596c7b491743039f2 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...)
---
opends/src/server/org/opends/server/tools/ImportLDIF.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/ImportLDIF.java b/opends/src/server/org/opends/server/tools/ImportLDIF.java
index e8ec74b..f242747 100644
--- a/opends/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opends/src/server/org/opends/server/tools/ImportLDIF.java
@@ -39,6 +39,7 @@
import org.opends.server.admin.std.server.BackendCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.ErrorLogPublisher;
+import org.opends.server.api.DebugLogPublisher;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.config.ConfigException;
import static org.opends.server.config.ConfigConstants.*;
@@ -46,8 +47,11 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
import org.opends.server.extensions.ConfigFileHandler;
-import org.opends.server.loggers.ThreadFilterTextErrorLogPublisher;
import org.opends.server.loggers.TextWriter;
+import org.opends.server.loggers.TextErrorLogPublisher;
+import org.opends.server.loggers.ErrorLogger;
+import org.opends.server.loggers.debug.TextDebugLogPublisher;
+import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.tools.makeldif.TemplateFile;
import org.opends.server.types.AttributeType;
@@ -90,8 +94,6 @@
*/
public static final int LDIF_BUFFER_SIZE = 1048576;
- private static ErrorLogPublisher errorLogPublisher = null;
-
/**
* The main method for ImportLDIF tool.
@@ -102,11 +104,6 @@
{
int retCode = mainImportLDIF(args, true, System.out, System.err);
- if(errorLogPublisher != null)
- {
- removeErrorLogPublisher(errorLogPublisher);
- }
-
if(retCode != 0)
{
System.exit(filterExitCode(retCode));
@@ -763,20 +760,21 @@
if (! quietMode.isPresent())
{
- // FIXME -- Install a custom logger to capture information about the
- // state of the import.
try
{
- errorLogPublisher =
- new ThreadFilterTextErrorLogPublisher(Thread.currentThread(),
- new TextWriter.STREAM(out));
- addErrorLogPublisher(errorLogPublisher);
-
+ 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)
{
err.println("Error installing the custom error logger: " +
- stackTraceToSingleLineString(e));
+ stackTraceToSingleLineString(e));
}
}
--
Gitblit v1.10.0