From 86d6566a6943c86d19f1a2bfd2ccd82d97223804 Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Tue, 10 Jul 2007 20:40:52 +0000
Subject: [PATCH] Fix for issue #1957: import from LDIF is too verbose.
---
opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java b/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java
index 3f1d131..53ac583 100644
--- a/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java
+++ b/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java
@@ -28,8 +28,6 @@
import org.opends.server.api.DirectoryThread;
import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.types.ErrorLogCategory;
-import org.opends.server.types.ErrorLogSeverity;
import org.opends.server.types.LDIFImportConfig;
import com.sleepycat.je.*;
@@ -49,7 +47,6 @@
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.MessageHandler.getMessage;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.server.messages.JebMessages.*;
@@ -193,17 +190,21 @@
if (files == null || files.length == 0)
{
- int msgID = MSGID_JEB_INDEX_MERGE_NO_DATA;
- String message = getMessage(msgID, index.getName());
- logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.NOTICE,
- message, msgID);
+ if (debugEnabled())
+ {
+ int msgID = MSGID_JEB_INDEX_MERGE_NO_DATA;
+ String message = getMessage(msgID, index.getName());
+ TRACER.debugInfo(message);
+ }
return;
}
- int msgID = MSGID_JEB_INDEX_MERGE_START;
- String message = getMessage(msgID, files.length, index.getName());
- logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.NOTICE,
- message, msgID);
+ if (debugEnabled())
+ {
+ int msgID = MSGID_JEB_INDEX_MERGE_START;
+ String message = getMessage(msgID, files.length, index.getName());
+ TRACER.debugInfo(message);
+ }
MergeReader[] readers = new MergeReader[files.length];
@@ -343,10 +344,12 @@
}
}
- msgID = MSGID_JEB_INDEX_MERGE_COMPLETE;
- message = getMessage(msgID, index.getName());
- logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.NOTICE,
- message, msgID);
+ if (debugEnabled())
+ {
+ int msgID = MSGID_JEB_INDEX_MERGE_COMPLETE;
+ String message = getMessage(msgID, index.getName());
+ TRACER.debugInfo(message);
+ }
}
/**
--
Gitblit v1.10.0