From d8e799bd818c9f26198a2d586bc8c647068f82dd Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 26 Apr 2016 07:54:21 +0000
Subject: [PATCH] tools: push initialization of loggers to the InitializationBuilder
---
opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java | 19 +------------------
1 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
index 65d36a2..ed78ab1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/RestoreDB.java
@@ -40,12 +40,7 @@
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
-import org.opends.server.loggers.DebugLogger;
-import org.opends.server.loggers.ErrorLogPublisher;
-import org.opends.server.loggers.ErrorLogger;
import org.opends.server.loggers.JDKLogging;
-import org.opends.server.loggers.TextErrorLogPublisher;
-import org.opends.server.loggers.TextWriter;
import org.opends.server.protocols.ldap.LDAPAttribute;
import org.opends.server.tasks.RestoreTask;
import org.opends.server.tools.tasks.TaskTool;
@@ -285,6 +280,7 @@
try
{
new DirectoryServer.InitializationBuilder(configFile.getValue())
+ .requireErrorAndDebugLogPublisher(out, err)
.initialize();
}
catch (InitializationException ie)
@@ -292,19 +288,6 @@
printWrappedText(err, ERR_CANNOT_INITIALIZE_SERVER_COMPONENTS.get(ie.getLocalizedMessage()));
return 1;
}
-
- try
- {
- ErrorLogPublisher errorLogPublisher =
- TextErrorLogPublisher.getToolStartupTextErrorPublisher(new TextWriter.STREAM(out));
- ErrorLogger.getInstance().addLogPublisher(errorLogPublisher);
- DebugLogger.getInstance().addPublisherIfRequired(new TextWriter.STREAM(out));
- }
- catch(Exception e)
- {
- err.println("Error installing the custom error logger: " +
- stackTraceToSingleLineString(e));
- }
}
--
Gitblit v1.10.0