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/RestoreDB.java | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/RestoreDB.java b/opends/src/server/org/opends/server/tools/RestoreDB.java
index c97e3a9..aad5a92 100644
--- a/opends/src/server/org/opends/server/tools/RestoreDB.java
+++ b/opends/src/server/org/opends/server/tools/RestoreDB.java
@@ -40,15 +40,18 @@
import org.opends.server.api.Backend;
import org.opends.server.api.ErrorLogPublisher;
+import org.opends.server.api.DebugLogPublisher;
import org.opends.server.config.ConfigException;
import static org.opends.server.config.ConfigConstants.*;
import org.opends.server.core.CoreConfigManager;
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.ErrorLogger;
+import org.opends.server.loggers.TextErrorLogPublisher;
+import org.opends.server.loggers.debug.TextDebugLogPublisher;
+import org.opends.server.loggers.debug.DebugLogger;
import org.opends.server.types.BackupDirectory;
import org.opends.server.types.BackupInfo;
import org.opends.server.types.DirectoryException;
@@ -81,8 +84,6 @@
* internally within the server process (e.g., via the tasks interface).
*/
public class RestoreDB extends TaskTool {
-
- private static ErrorLogPublisher errorLogPublisher = null;
/**
* The main method for RestoreDB tool.
*
@@ -93,11 +94,6 @@
{
int retCode = mainRestoreDB(args, true, System.out, System.err);
- if(errorLogPublisher != null)
- {
- ErrorLogger.removeErrorLogPublisher(errorLogPublisher);
- }
-
if(retCode != 0)
{
System.exit(filterExitCode(retCode));
@@ -455,15 +451,16 @@
}
- // FIXME -- Install a custom logger to capture information about the state
- // of the export.
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