From 72fdad0cd16580c4d7b3c43df6fbe49e20d8c71f Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 28 Apr 2016 07:19:28 +0000
Subject: [PATCH] ImportLDIF use InitializationBuilder.requireErrorAndDebugLogPublisher()
---
opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java | 37 +++++++++----------------------------
1 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
index 96fcee9..d851208 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ImportLDIF.java
@@ -42,12 +42,9 @@
import org.opends.server.api.Backend.BackendOperation;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.core.DirectoryServer.InitializationBuilder;
import org.opends.server.core.LockFileManager;
-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.ImportTask;
import org.opends.server.tools.makeldif.TemplateFile;
@@ -487,41 +484,25 @@
}
@Override
- protected int processLocal(boolean initializeServer,
- PrintStream out,
- PrintStream err) {
-
-
+ protected int processLocal(boolean initializeServer, PrintStream out, PrintStream err) {
if (initializeServer)
{
try
{
- new DirectoryServer.InitializationBuilder(configFile.getValue())
+ InitializationBuilder initBuilder = new DirectoryServer.InitializationBuilder(configFile.getValue())
.requireCryptoServices()
- .requireUserPlugins(PluginType.LDIF_IMPORT)
- .initialize();
+ .requireUserPlugins(PluginType.LDIF_IMPORT);
+ if (!quietMode.isPresent())
+ {
+ initBuilder.requireErrorAndDebugLogPublisher(out, err);
+ }
+ initBuilder.initialize();
}
catch (InitializationException e)
{
printWrappedText(err, ERR_CANNOT_INITIALIZE_SERVER_COMPONENTS.get(e.getLocalizedMessage()));
return 1;
}
- if (! quietMode.isPresent())
- {
- try
- {
- ErrorLogPublisher errorLogPublisher =
- TextErrorLogPublisher.getToolStartupTextErrorPublisher(
- new TextWriter.STREAM(out));
- ErrorLogger.getInstance().addLogPublisher(errorLogPublisher);
- }
- catch(Exception e)
- {
- err.println("Error installing the custom error logger: " +
- stackTraceToSingleLineString(e));
- return 1;
- }
- }
}
// See if there were any user-defined sets of include/exclude attributes or
--
Gitblit v1.10.0