From 1f164e01309bb6f2bdf7ad3e0dc9f8ec969e63b0 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...)
---
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java | 10
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java | 4
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java | 6
opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java | 36 ++-
opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java | 29 --
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 40 ++--
opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java | 28 +-
opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java | 28 +-
opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java | 8
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java | 4
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RebuildJob.java | 16 +-
opendj-sdk/opends/src/server/org/opends/server/tools/RebuildIndex.java | 24 +-
opendj-sdk/opends/src/server/org/opends/server/loggers/ErrorLogger.java | 23 --
opendj-sdk/opends/src/messages/messages/jeb.properties | 106 +++++--------
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java | 13 -
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java | 4
opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java | 25 +-
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ExportJob.java | 4
opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogger.java | 28 ---
opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java | 30 +--
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/BufferManager.java | 2
opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java | 4
22 files changed, 184 insertions(+), 288 deletions(-)
diff --git a/opendj-sdk/opends/src/messages/messages/jeb.properties b/opendj-sdk/opends/src/messages/messages/jeb.properties
index 20ac108..af3690d 100644
--- a/opendj-sdk/opends/src/messages/messages/jeb.properties
+++ b/opendj-sdk/opends/src/messages/messages/jeb.properties
@@ -69,17 +69,6 @@
SEVERE_ERR_JEB_ENTRY_DATABASE_CORRUPT_12=The entry database does not contain \
a valid record for ID %s
SEVERE_ERR_JEB_DATABASE_EXCEPTION_14=Database exception: %s
-INFO_CONFIG_DESCRIPTION_INDEX_ATTRIBUTE_16=The attribute type name of the \
- attribute index
-INFO_CONFIG_DESCRIPTION_INDEX_TYPE_17=The kind of indexing to be enabled on \
- an attribute index. Permitted values include "equality", "presence", \
- "substring" and "ordering")
-INFO_CONFIG_DESCRIPTION_INDEX_ENTRY_LIMIT_18=A performance tuning parameter \
- for attribute indexes. The entry limit of an attribute index, where a value \
- of 0 means there is no threshold. When the number of entries matching an \
- index value reaches the limit, the value is no longer maintained in the index
-INFO_CONFIG_DESCRIPTION_INDEX_SUBSTRING_LENGTH_25=The length of substrings in \
- a substring index
SEVERE_ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE_26=The attribute '%s' cannot \
have indexing of type '%s' because it does not have a corresponding matching \
rule
@@ -182,34 +171,30 @@
restore the files from backup %s: %s
SEVERE_ERR_JEB_BACKUP_MISSING_BACKUPID_79=The information for backup %s could \
not be found in the backup directory %s
-INFO_JEB_BACKUP_FILE_UNCHANGED_82=Not changed: %s
-INFO_JEB_BACKUP_CLEANER_ACTIVITY_83=Including %s additional log file(s) due \
+NOTICE_JEB_BACKUP_FILE_UNCHANGED_82=Not changed: %s
+NOTICE_JEB_BACKUP_CLEANER_ACTIVITY_83=Including %s additional log file(s) due \
to cleaner activity
-INFO_JEB_BACKUP_VERIFY_FILE_84=Verifying: %s
-INFO_JEB_BACKUP_RESTORED_FILE_85=Restored: %s (size %d)
-INFO_JEB_BACKUP_ARCHIVED_FILE_86=Archived: %s
-INFO_JEB_EXPORT_FINAL_STATUS_87=Exported %d entries and skipped %d in %d \
+NOTICE_JEB_BACKUP_VERIFY_FILE_84=Verifying: %s
+NOTICE_JEB_BACKUP_RESTORED_FILE_85=Restored: %s (size %d)
+NOTICE_JEB_BACKUP_ARCHIVED_FILE_86=Archived: %s
+NOTICE_JEB_EXPORT_FINAL_STATUS_87=Exported %d entries and skipped %d in %d \
seconds (average rate %.1f/sec)
-INFO_JEB_EXPORT_PROGRESS_REPORT_88=Exported %d records and skipped %d (recent \
+NOTICE_JEB_EXPORT_PROGRESS_REPORT_88=Exported %d records and skipped %d (recent \
rate %.1f/sec)
INFO_JEB_IMPORT_THREAD_COUNT_89=Import Thread Count: %d threads
INFO_JEB_IMPORT_BUFFER_SIZE_90=Buffer size per thread = %,d
INFO_JEB_IMPORT_LDIF_PROCESSING_TIME_91=LDIF processing took %d seconds
INFO_JEB_IMPORT_INDEX_PROCESSING_TIME_92=Index processing took %d seconds
-INFO_JEB_IMPORT_CLOSING_DATABASE_93=Flushing data to disk
-INFO_JEB_IMPORT_FINAL_STATUS_94=Processed %d entries, imported %d, skipped \
+NOTICE_JEB_IMPORT_CLOSING_DATABASE_93=Flushing data to disk
+NOTICE_JEB_IMPORT_FINAL_STATUS_94=Processed %d entries, imported %d, skipped \
%d, rejected %d and migrated %d in %d seconds (average rate %.1f/sec)
-INFO_JEB_IMPORT_ENTRY_LIMIT_EXCEEDED_COUNT_95=Number of index values that \
+NOTICE_JEB_IMPORT_ENTRY_LIMIT_EXCEEDED_COUNT_95=Number of index values that \
exceeded the entry limit: %d
-INFO_JEB_IMPORT_PROGRESS_REPORT_96=Processed %d entries, skipped %d, rejected \
+NOTICE_JEB_IMPORT_PROGRESS_REPORT_96=Processed %d entries, skipped %d, rejected \
%d, and migrated %d (recent rate %.1f/sec)
INFO_JEB_IMPORT_CACHE_AND_MEMORY_REPORT_97=Free memory = %d MB, Cache miss \
rate = %.1f/entry
-INFO_JEB_INDEX_MERGE_NO_DATA_98=There is no data to be loaded into the %s \
- index
-INFO_JEB_INDEX_MERGE_START_99=Starting %d-way merge to load the %s index
-INFO_JEB_INDEX_MERGE_COMPLETE_100=The %s index has been loaded
-INFO_JEB_VERIFY_CLEAN_FINAL_STATUS_101=Checked %d records and found %d \
+NOTICE_JEB_VERIFY_CLEAN_FINAL_STATUS_101=Checked %d records and found %d \
error(s) in %d seconds (average rate %.1f/sec)
INFO_JEB_VERIFY_MULTIPLE_REFERENCE_COUNT_102=Number of records referencing \
more than one entry: %d
@@ -219,45 +204,36 @@
referenced is %.2f/record
INFO_JEB_VERIFY_MAX_REFERENCE_COUNT_105=Maximum number of entries referenced \
by any record is %d
-INFO_JEB_VERIFY_FINAL_STATUS_106=Checked %d entries and found %d error(s) in \
+NOTICE_JEB_VERIFY_FINAL_STATUS_106=Checked %d entries and found %d error(s) in \
%d seconds (average rate %.1f/sec)
INFO_JEB_VERIFY_ENTRY_LIMIT_STATS_HEADER_107=Statistics for records that have \
exceeded the entry limit:
-INFO_JEB_VERIFY_ENTRY_LIMIT_STATS_ROW_108= File %s has %d such record(s) \
+INFO_JEB_VERIFY_ENTRY_LIMIT_STATS_ROW_108=File %s has %d such record(s) \
min=%d max=%d median=%d
-INFO_JEB_VERIFY_PROGRESS_REPORT_109=Processed %d out of %d records and found \
+NOTICE_JEB_VERIFY_PROGRESS_REPORT_109=Processed %d out of %d records and found \
%d error(s) (recent rate %.1f/sec)
INFO_JEB_VERIFY_CACHE_AND_MEMORY_REPORT_110=Free memory = %d MB, Cache miss \
rate = %.1f/record
MILD_ERR_JEB_INVALID_PAGED_RESULTS_COOKIE_111=The following paged results \
control cookie value was not recognized: %s
-INFO_JEB_REFERRAL_RESULT_MESSAGE_112=A referral entry %s indicates that the \
+NOTICE_JEB_REFERRAL_RESULT_MESSAGE_112=A referral entry %s indicates that the \
operation must be processed at a different server
INFO_JEB_IMPORT_ENVIRONMENT_CONFIG_119=Database environment properties: %s
-INFO_JEB_IMPORT_BEGINNING_INTERMEDIATE_MERGE_121=Ending import pass %d \
- because the pass size has been reached. Beginning the intermediate index \
- merge
-INFO_JEB_IMPORT_BEGINNING_FINAL_MERGE_122=Beginning final index merge
-INFO_JEB_IMPORT_RESUMING_LDIF_PROCESSING_123=Intermediate index merge \
- processing complete (index processing time %d seconds). Resuming LDIF \
- processing
-INFO_JEB_IMPORT_FINAL_MERGE_COMPLETED_124=Final index merge complete \
- (processing time %d seconds)
SEVERE_ERR_JEB_INCOMPATIBLE_ENTRY_VERSION_126=Entry record with ID %s is not \
compatible with this version of the backend database. Entry version: %x
-INFO_JEB_LOOKTHROUGH_LIMIT_EXCEEDED_127=This search operation has checked the \
+NOTICE_JEB_LOOKTHROUGH_LIMIT_EXCEEDED_127=This search operation has checked the \
maximum of %d entries for matches
SEVERE_WARN_JEB_SET_PERMISSIONS_FAILED_128=An error occurred while setting \
file permissions for the backend database directory %s: %s
SEVERE_WARN_JEB_GET_ENTRY_COUNT_FAILED_129=Unable to determine the total \
number of entries in the container: %s
-INFO_JEB_CONFIG_ATTR_REQUIRES_RESTART_130=The change to the %s attribute will \
+NOTICE_JEB_CONFIG_ATTR_REQUIRES_RESTART_130=The change to the %s attribute will \
not take effect until the backend is restarted
-INFO_JEB_REBUILD_PROGRESS_REPORT_131=%.1f%% Completed. Processed %d/%d \
+NOTICE_JEB_REBUILD_PROGRESS_REPORT_131=%.1f%% Completed. Processed %d/%d \
records. (recent rate %.1f/sec)
-INFO_JEB_REBUILD_CACHE_AND_MEMORY_REPORT_132=Free memory = %d MB, Cache miss \
+NOTICE_JEB_REBUILD_CACHE_AND_MEMORY_REPORT_132=Free memory = %d MB, Cache miss \
rate = %.1f/record
-INFO_JEB_REBUILD_FINAL_STATUS_133=Rebuild complete. Processed %d records in \
+NOTICE_JEB_REBUILD_FINAL_STATUS_133=Rebuild complete. Processed %d records in \
%d seconds (average rate %.1f/sec)
SEVERE_ERR_JEB_REBUILD_INDEX_FAILED_134=An error occurred while rebuilding \
index %s: %s
@@ -265,7 +241,7 @@
inserting entry into the %s database/index: %s
SEVERE_ERR_JEB_REBUILD_INDEX_CONFLICT_136=Another rebuild of index %s is \
already in progress
-INFO_JEB_REBUILD_START_137=Rebuild of index(es) %s started with %d total \
+NOTICE_JEB_REBUILD_START_137=Rebuild of index(es) %s started with %d total \
records to process
SEVERE_ERR_JEB_REBUILD_BACKEND_ONLINE_138=Rebuilding system index(es) must be \
done with the backend containing the base DN disabled
@@ -312,9 +288,9 @@
'%s' provided for configuration entry '%s' is invalid. The value must be one \
of OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST, or ALL. Note \
that these values are case sensitive
-INFO_JEB_IMPORT_MIGRATION_START_157=Migrating %s entries for base DN %s
-INFO_JEB_IMPORT_LDIF_START_158=Processing LDIF
-INFO_JEB_IMPORT_LDIF_END_159=End of LDIF reached
+NOTICE_JEB_IMPORT_MIGRATION_START_157=Migrating %s entries for base DN %s
+NOTICE_JEB_IMPORT_LDIF_START_158=Processing LDIF
+NOTICE_JEB_IMPORT_LDIF_END_159=End of LDIF reached
SEVERE_ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR_160=Sort attribute %s for VLV \
index %s is not defined in the server schema
SEVERE_ERR_JEB_CONFIG_VLV_INDEX_BAD_FILTER_161=An error occurred while parsing \
@@ -347,39 +323,39 @@
SEVERE_ERR_JEB_COMPSCHEMA_UNRECOGNIZED_AD_TOKEN_171=Unable to decode the \
provided attribute because it used an undefined attribute description token \
%s
-INFO_JEB_CONFIG_DB_DIR_REQUIRES_RESTART_172=The change to the DB directory \
+NOTICE_JEB_CONFIG_DB_DIR_REQUIRES_RESTART_172=The change to the DB directory \
will not take effect until the backend is restarted. The DB files from the \
previous directory %s must be moved to the new directory %s after shutting \
down the backend to retain the existing data
-INFO_JEB_IMPORT_STARTING_173=%s starting import (build %s, R%d)
+NOTICE_JEB_IMPORT_STARTING_173=%s starting import (build %s, R%d)
SEVERE_ERR_JEB_DIRECTORY_DOES_NOT_EXIST_174=The backend database directory \
'%s' does not exist
SEVERE_ERR_JEB_IMPORT_LDIF_ABORT_175=The import was aborted because an \
uncaught exception was thrown during processing
-INFO_JEB_IMPORT_LDIF_ROOTCONTAINER_CLOSE_176=Import LDIF environment close \
+NOTICE_JEB_IMPORT_LDIF_ROOTCONTAINER_CLOSE_176=Import LDIF environment close \
took %d seconds
-INFO_JEB_IMPORT_LDIF_BUFFER_FLUSH_177=Begin substring buffer flush of %d \
+NOTICE_JEB_IMPORT_LDIF_BUFFER_FLUSH_177=Begin substring buffer flush of %d \
elements. Buffer total access: %d buffer hits: %d
-INFO_JEB_IMPORT_LDIF_BUFFER_FLUSH_COMPLETED_178=Substring buffer flush \
+NOTICE_JEB_IMPORT_LDIF_BUFFER_FLUSH_COMPLETED_178=Substring buffer flush \
completed in %d seconds
-INFO_JEB_IMPORT_LDIF_FINAL_CLEAN_179=Begin final cleaner run
-INFO_JEB_IMPORT_LDIF_CLEAN_180=Begin cleaner run
-INFO_JEB_IMPORT_LDIF_CLEANER_RUN_DONE_181=Cleaner run took %d seconds %d logs \
+NOTICE_JEB_IMPORT_LDIF_FINAL_CLEAN_179=Begin final cleaner run
+NOTICE_JEB_IMPORT_LDIF_CLEAN_180=Begin cleaner run
+NOTICE_JEB_IMPORT_LDIF_CLEANER_RUN_DONE_181=Cleaner run took %d seconds %d logs \
removed
-INFO_JEB_IMPORT_LDIF_CLEANER_REMOVE_LOGS_182=Cleaner will remove %d logs
-INFO_JEB_IMPORT_LDIF_BUFFER_TOT_AVAILMEM_184=Available buffer memory %d bytes is \
+NOTICE_JEB_IMPORT_LDIF_CLEANER_REMOVE_LOGS_182=Cleaner will remove %d logs
+NOTICE_JEB_IMPORT_LDIF_BUFFER_TOT_AVAILMEM_184=Available buffer memory %d bytes is \
below the minimum value of %d bytes. Setting available buffer memory to \
the minimum
-INFO_JEB_IMPORT_LDIF_MEMORY_INFO_185=Using DB cache bytes: %d available \
+NOTICE_JEB_IMPORT_LDIF_MEMORY_INFO_185=Using DB cache bytes: %d available \
substring buffer bytes: %d
-INFO_JEB_IMPORT_LDIF_BUFFER_CONTEXT_AVAILMEM_186=Available buffer memory %d \
+NOTICE_JEB_IMPORT_LDIF_BUFFER_CONTEXT_AVAILMEM_186=Available buffer memory %d \
bytes is below the minimum value of %d bytes allowed for a single import \
context. Setting context available buffer memory to the minimum
-INFO_JEB_IMPORT_LDIF_BUFFER_CHECKPOINTS_187=Checkpoints performed: %d
-INFO_JEB_IMPORT_LDIF_CLEANER_STATS_188=Cleaner runs: %d files deleted: %d \
+NOTICE_JEB_IMPORT_LDIF_BUFFER_CHECKPOINTS_187=Checkpoints performed: %d
+NOTICE_JEB_IMPORT_LDIF_CLEANER_STATS_188=Cleaner runs: %d files deleted: %d \
entries read: %d IN nodes cleaned: %d
-INFO_JEB_IMPORT_LDIF_EVICTION_DETECTED_STATS_189=Eviction in progress. Passes: \
+NOTICE_JEB_IMPORT_LDIF_EVICTION_DETECTED_STATS_189=Eviction in progress. Passes: \
%d nodes evicted: %d BIN nodes stripped: %d
-INFO_JEB_IMPORT_LDIF_EVICTION_DETECTED_190=Eviction detected after importing \
+NOTICE_JEB_IMPORT_LDIF_EVICTION_DETECTED_190=Eviction detected after importing \
%d entries
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
index b3604a5..5fca7fb 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -1243,7 +1243,7 @@
long finishTime = System.currentTimeMillis();
long closeTime = (finishTime - startTime) / 1000;
Message msg =
- INFO_JEB_IMPORT_LDIF_ROOTCONTAINER_CLOSE.get(closeTime);
+ NOTE_JEB_IMPORT_LDIF_ROOTCONTAINER_CLOSE.get(closeTime);
logError(msg);
rootContainer = null;
}
@@ -1251,7 +1251,7 @@
// Sync the environment to disk.
if (debugEnabled())
{
- Message message = INFO_JEB_IMPORT_CLOSING_DATABASE.get();
+ Message message = NOTE_JEB_IMPORT_CLOSING_DATABASE.get();
TRACER.debugInfo(message.toString());
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
index f217f52..fb8bc21 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/BackupManager.java
@@ -491,7 +491,7 @@
break;
}
- message = INFO_JEB_BACKUP_FILE_UNCHANGED.get(logFileName);
+ message = NOTE_JEB_BACKUP_FILE_UNCHANGED.get(logFileName);
logError(message);
unchangedList.add(logFileName);
@@ -609,7 +609,7 @@
Arrays.sort(logFiles);
- message = INFO_JEB_BACKUP_CLEANER_ACTIVITY.get(
+ message = NOTE_JEB_BACKUP_CLEANER_ACTIVITY.get(
String.valueOf(logFiles.length));
logError(message);
}
@@ -1068,7 +1068,7 @@
{
if (verifyOnly)
{
- Message message = INFO_JEB_BACKUP_VERIFY_FILE.get(zipEntry.getName());
+ Message message = NOTE_JEB_BACKUP_VERIFY_FILE.get(zipEntry.getName());
logError(message);
}
@@ -1113,7 +1113,7 @@
{
outputStream.close();
- Message message = INFO_JEB_BACKUP_RESTORED_FILE.get(
+ Message message = NOTE_JEB_BACKUP_RESTORED_FILE.get(
zipEntry.getName(), totalBytesRead);
logError(message);
}
@@ -1210,7 +1210,7 @@
// Finish the zip entry.
zipStream.closeEntry();
- Message message = INFO_JEB_BACKUP_ARCHIVED_FILE.get(zipEntry.getName());
+ Message message = NOTE_JEB_BACKUP_ARCHIVED_FILE.get(zipEntry.getName());
logError(message);
return totalBytesRead;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java
index ce3c4c5..114f4af 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/DN2URI.java
@@ -59,7 +59,7 @@
import static org.opends.server.util.ServerConstants.ATTR_REFERRAL_URL;
import static org.opends.server.loggers.debug.DebugLogger.*;
import static org.opends.messages.JebMessages.
- INFO_JEB_REFERRAL_RESULT_MESSAGE;
+ NOTE_JEB_REFERRAL_RESULT_MESSAGE;
/**
* This class represents the referral database which contains URIs from referral
* entries. The key is the DN of the referral entry and the value is that of a
@@ -517,7 +517,7 @@
// Throw a directory referral exception containing the URIs.
Message msg =
- INFO_JEB_REFERRAL_RESULT_MESSAGE.get(String.valueOf(referralDN));
+ NOTE_JEB_REFERRAL_RESULT_MESSAGE.get(String.valueOf(referralDN));
throw new DirectoryException(
ResultCode.REFERRAL, msg, referralDN, URIList, null);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 52204f6..3077136 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -1305,7 +1305,7 @@
//Lookthrough limit exceeded
searchOperation.setResultCode(ResultCode.ADMIN_LIMIT_EXCEEDED);
searchOperation.appendErrorMessage(
- INFO_JEB_LOOKTHROUGH_LIMIT_EXCEEDED.get(lookthroughLimit));
+ NOTE_JEB_LOOKTHROUGH_LIMIT_EXCEEDED.get(lookthroughLimit));
return;
}
int cmp = dn2id.getComparator().compare(key.getData(), end);
@@ -1498,7 +1498,7 @@
//Lookthrough limit exceeded
searchOperation.setResultCode(ResultCode.ADMIN_LIMIT_EXCEEDED);
searchOperation.appendErrorMessage(
- INFO_JEB_LOOKTHROUGH_LIMIT_EXCEEDED.get(lookthroughLimit));
+ NOTE_JEB_LOOKTHROUGH_LIMIT_EXCEEDED.get(lookthroughLimit));
continueSearch = false;
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ExportJob.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ExportJob.java
index 15a759a..68477ab 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ExportJob.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/ExportJob.java
@@ -174,7 +174,7 @@
rate = 1000f*exportedCount / totalTime;
}
- Message message = INFO_JEB_EXPORT_FINAL_STATUS.get(
+ Message message = NOTE_JEB_EXPORT_FINAL_STATUS.get(
exportedCount, skippedCount, totalTime/1000, rate);
logError(message);
@@ -313,7 +313,7 @@
float rate = 1000f*deltaCount / deltaTime;
Message message =
- INFO_JEB_EXPORT_PROGRESS_REPORT.get(latestCount, skippedCount, rate);
+ NOTE_JEB_EXPORT_PROGRESS_REPORT.get(latestCount, skippedCount, rate);
logError(message);
previousCount = latestCount;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RebuildJob.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RebuildJob.java
index 544b6f2..3d9e55e 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RebuildJob.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RebuildJob.java
@@ -46,15 +46,15 @@
import static org.opends.messages.JebMessages.
ERR_JEB_ATTRIBUTE_INDEX_NOT_CONFIGURED;
import static org.opends.messages.JebMessages.
- INFO_JEB_REBUILD_PROGRESS_REPORT;
+ NOTE_JEB_REBUILD_PROGRESS_REPORT;
import static org.opends.messages.JebMessages.
- INFO_JEB_REBUILD_FINAL_STATUS;
+ NOTE_JEB_REBUILD_FINAL_STATUS;
import static org.opends.messages.JebMessages.
- INFO_JEB_REBUILD_CACHE_AND_MEMORY_REPORT;
+ NOTE_JEB_REBUILD_CACHE_AND_MEMORY_REPORT;
import static org.opends.messages.JebMessages.
ERR_JEB_REBUILD_INDEX_CONFLICT;
import static org.opends.messages.JebMessages.
- INFO_JEB_REBUILD_START;
+ NOTE_JEB_REBUILD_START;
import static org.opends.messages.JebMessages.
ERR_JEB_VLV_INDEX_NOT_CONFIGURED;
/**
@@ -212,7 +212,7 @@
completed = 100f*latestProcessed / totalEntries;
}
- Message message = INFO_JEB_REBUILD_PROGRESS_REPORT.get(
+ Message message = NOTE_JEB_REBUILD_PROGRESS_REPORT.get(
completed, latestProcessed, totalEntries, rate);
logError(message);
@@ -232,7 +232,7 @@
cacheMissRate = nCacheMiss/(float)deltaCount;
}
- message = INFO_JEB_REBUILD_CACHE_AND_MEMORY_REPORT.get(
+ message = NOTE_JEB_REBUILD_CACHE_AND_MEMORY_REPORT.get(
freeMemory, cacheMissRate);
logError(message);
@@ -471,7 +471,7 @@
sb.append(index);
}
Message message =
- INFO_JEB_REBUILD_START.get(sb.toString(), totalToProcess);
+ NOTE_JEB_REBUILD_START.get(sb.toString(), totalToProcess);
logError(message);
// Make a note of the time we started.
@@ -547,7 +547,7 @@
rate = 1000f*totalProcessed / totalTime;
}
- message = INFO_JEB_REBUILD_FINAL_STATUS.get(
+ message = NOTE_JEB_REBUILD_FINAL_STATUS.get(
totalProcessed, totalTime/1000, rate);
logError(message);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java
index ee30ca5..d1a61f7 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/RootContainer.java
@@ -891,7 +891,7 @@
getAttributeForProperty(param.getName());
if (configAttr != null)
{
- messages.add(INFO_JEB_CONFIG_ATTR_REQUIRES_RESTART.get(
+ messages.add(NOTE_JEB_CONFIG_ATTR_REQUIRES_RESTART.get(
configAttr));
}
if(debugEnabled())
@@ -947,7 +947,7 @@
}
adminActionRequired = true;
- messages.add(INFO_JEB_CONFIG_DB_DIR_REQUIRES_RESTART.get(
+ messages.add(NOTE_JEB_CONFIG_DB_DIR_REQUIRES_RESTART.get(
this.config.getDBDirectory(), cfg.getDBDirectory()));
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
index 5abe7d4..db34e48 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/VerifyJob.java
@@ -345,7 +345,7 @@
String.valueOf(keyCount));
if (cleanMode)
{
- Message message = INFO_JEB_VERIFY_CLEAN_FINAL_STATUS.get(
+ Message message = NOTE_JEB_VERIFY_CLEAN_FINAL_STATUS.get(
keyCount, errorCount, totalTime/1000, rate);
logError(message);
@@ -384,7 +384,7 @@
}
else
{
- Message message = INFO_JEB_VERIFY_FINAL_STATUS.get(
+ Message message = NOTE_JEB_VERIFY_FINAL_STATUS.get(
keyCount, errorCount, totalTime/1000, rate);
logError(message);
//TODO add entry-limit-stats to the statEntry
@@ -2092,7 +2092,7 @@
float rate = 1000f*deltaCount / deltaTime;
- Message message = INFO_JEB_VERIFY_PROGRESS_REPORT.get(
+ Message message = NOTE_JEB_VERIFY_PROGRESS_REPORT.get(
latestCount, totalCount, errorCount, rate);
logError(message);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/BufferManager.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/BufferManager.java
index 10dbf07..66a55e8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/BufferManager.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/BufferManager.java
@@ -179,7 +179,7 @@
void prepareFlush() {
limitFlush=false;
Message msg =
- INFO_JEB_IMPORT_LDIF_BUFFER_FLUSH.get(elementMap.size(), total, hit);
+ NOTE_JEB_IMPORT_LDIF_BUFFER_FLUSH.get(elementMap.size(), total, hit);
logError(msg);
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index ce98383..677a379 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -165,7 +165,7 @@
//Below min, use the min value.
if(memoryPerContext < minBuffer) {
Message msg =
- INFO_JEB_IMPORT_LDIF_BUFFER_CONTEXT_AVAILMEM.get(memoryPerContext,
+ NOTE_JEB_IMPORT_LDIF_BUFFER_CONTEXT_AVAILMEM.get(memoryPerContext,
minBuffer);
logError(msg);
memoryPerContext = minBuffer;
@@ -218,7 +218,7 @@
long startTime;
try {
int importThreadCount = config.getImportThreadCount();
- message = INFO_JEB_IMPORT_STARTING.get(DirectoryServer.getVersionString(),
+ message = NOTE_JEB_IMPORT_STARTING.get(DirectoryServer.getVersionString(),
BUILD_ID, REVISION_NUMBER);
logError(message);
message = INFO_JEB_IMPORT_THREAD_COUNT.get(importThreadCount);
@@ -314,13 +314,13 @@
rate = 1000f*importedCount / importTime;
}
- message = INFO_JEB_IMPORT_FINAL_STATUS.
+ message = NOTE_JEB_IMPORT_FINAL_STATUS.
get(reader.getEntriesRead(), importedCount,
reader.getEntriesIgnored(), reader.getEntriesRejected(),
migratedCount, importTime/1000, rate);
logError(message);
- message = INFO_JEB_IMPORT_ENTRY_LIMIT_EXCEEDED_COUNT.get(
+ message = NOTE_JEB_IMPORT_ENTRY_LIMIT_EXCEEDED_COUNT.get(
getEntryLimitExceededCount());
logError(message);
@@ -341,7 +341,7 @@
if(!firstClean || (entriesRead % evictEntryNumber) == 0) {
//Make sure work queue is empty before starting.
drainWorkQueue();
- Message msg = INFO_JEB_IMPORT_LDIF_CLEAN.get();
+ Message msg = NOTE_JEB_IMPORT_LDIF_CLEAN.get();
runCleaner(msg);
if(!firstClean) {
firstClean=true;
@@ -366,14 +366,14 @@
int cleaned = rootContainer.cleanedLogFiles();
//This checkpoint removes the files if any were cleaned.
if(cleaned > 0) {
- msg = INFO_JEB_IMPORT_LDIF_CLEANER_REMOVE_LOGS.get(cleaned);
+ msg = NOTE_JEB_IMPORT_LDIF_CLEANER_REMOVE_LOGS.get(cleaned);
logError(msg);
rootContainer.importForceCheckPoint();
}
pTask.setPause(false);
long finishTime = System.currentTimeMillis();
long cleanTime = (finishTime - startTime) / 1000;
- msg = INFO_JEB_IMPORT_LDIF_CLEANER_RUN_DONE.get(cleanTime, cleaned);
+ msg = NOTE_JEB_IMPORT_LDIF_CLEANER_RUN_DONE.get(cleanTime, cleaned);
logError(msg);
}
@@ -386,7 +386,7 @@
*/
private void
processLDIF() throws JebException, DatabaseException, IOException {
- Message message = INFO_JEB_IMPORT_LDIF_START.get();
+ Message message = NOTE_JEB_IMPORT_LDIF_START.get();
logError(message);
do {
if (ldifImportConfig.isCancelled()) {
@@ -404,7 +404,7 @@
Entry entry = reader.readEntry();
// Check for end of file.
if (entry == null) {
- message = INFO_JEB_IMPORT_LDIF_END.get();
+ message = NOTE_JEB_IMPORT_LDIF_END.get();
logError(message);
break;
@@ -546,13 +546,13 @@
stopWorkThreads(true, false);
long finishTime = System.currentTimeMillis();
long flushTime = (finishTime - startTime) / 1000;
- msg = INFO_JEB_IMPORT_LDIF_BUFFER_FLUSH_COMPLETED.get(flushTime);
+ msg = NOTE_JEB_IMPORT_LDIF_BUFFER_FLUSH_COMPLETED.get(flushTime);
logError(msg);
timer.cancel();
for(DNContext context : importMap.values()) {
context.setIndexesTrusted();
}
- msg = INFO_JEB_IMPORT_LDIF_FINAL_CLEAN.get();
+ msg = NOTE_JEB_IMPORT_LDIF_FINAL_CLEAN.get();
//Run the cleaner.
runCleaner(msg);
}
@@ -779,12 +779,12 @@
totalAvailBufferMemory = (totFreeMemory * 10) / 100;
if(totalAvailBufferMemory < (10 * minBuffer)) {
msg =
- INFO_JEB_IMPORT_LDIF_BUFFER_TOT_AVAILMEM.get(totalAvailBufferMemory,
+ NOTE_JEB_IMPORT_LDIF_BUFFER_TOT_AVAILMEM.get(totalAvailBufferMemory,
(10 * minBuffer));
logError(msg);
totalAvailBufferMemory = (10 * minBuffer);
}
- msg=INFO_JEB_IMPORT_LDIF_MEMORY_INFO.get(dbCacheLimit,
+ msg=NOTE_JEB_IMPORT_LDIF_MEMORY_INFO.get(dbCacheLimit,
totalAvailBufferMemory);
logError(msg);
}
@@ -815,7 +815,7 @@
DatabaseEntry data = new DatabaseEntry();
LockMode lockMode = LockMode.DEFAULT;
OperationStatus status;
- Message message = INFO_JEB_IMPORT_MIGRATION_START.get(
+ Message message = NOTE_JEB_IMPORT_MIGRATION_START.get(
"existing", String.valueOf(context.getBaseDN()));
logError(message);
Cursor cursor =
@@ -881,7 +881,7 @@
DatabaseEntry data = new DatabaseEntry();
LockMode lockMode = LockMode.DEFAULT;
OperationStatus status;
- Message message = INFO_JEB_IMPORT_MIGRATION_START.get(
+ Message message = NOTE_JEB_IMPORT_MIGRATION_START.get(
"excluded", String.valueOf(importContext.getBaseDN()));
logError(message);
Cursor cursor =
@@ -1032,7 +1032,7 @@
long numIgnored = reader.getEntriesIgnored();
long numRejected = reader.getEntriesRejected();
float rate = 1000f*deltaCount / deltaTime;
- message = INFO_JEB_IMPORT_PROGRESS_REPORT.get(
+ message = NOTE_JEB_IMPORT_PROGRESS_REPORT.get(
numRead, numIgnored, numRejected, 0, rate);
logError(message);
}
@@ -1066,22 +1066,22 @@
if(!ldifRead) {
evictionEntryCount=reader.getEntriesRead();
message =
- INFO_JEB_IMPORT_LDIF_EVICTION_DETECTED.get(evictionEntryCount);
+ NOTE_JEB_IMPORT_LDIF_EVICTION_DETECTED.get(evictionEntryCount);
logError(message);
}
}
message =
- INFO_JEB_IMPORT_LDIF_EVICTION_DETECTED_STATS.get(evictPasses,
+ NOTE_JEB_IMPORT_LDIF_EVICTION_DETECTED_STATS.get(evictPasses,
evictNodes, evictBinsStrip);
logError(message);
}
if(cleanerRuns != 0) {
- message = INFO_JEB_IMPORT_LDIF_CLEANER_STATS.get(cleanerRuns,
+ message = NOTE_JEB_IMPORT_LDIF_CLEANER_STATS.get(cleanerRuns,
cleanerDeletions, cleanerEntriesRead, cleanerINCleaned);
logError(message);
}
if(checkPoints > 1) {
- message = INFO_JEB_IMPORT_LDIF_BUFFER_CHECKPOINTS.get(checkPoints);
+ message = NOTE_JEB_IMPORT_LDIF_BUFFER_CHECKPOINTS.get(checkPoints);
logError(message);
}
prevEnvStats = envStats;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
index cea6268..9887847 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -88,6 +88,7 @@
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.loggers.debug.DebugLogger;
+import org.opends.server.loggers.debug.TextDebugLogPublisher;
import org.opends.messages.MessageDescriptor;
import org.opends.messages.Message;
@@ -190,16 +191,7 @@
import java.io.PrintStream;
import java.net.InetAddress;
import java.text.DecimalFormat;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
@@ -1453,11 +1445,6 @@
logError(message);
sendAlertNotification(this, ALERT_TYPE_SERVER_STARTED, message);
-
- // Remove default loggers
- ErrorLogger.removeFirstErrorLogPublisher();
- DebugLogger.removeFirstDebugLogPublisher();
-
// Force the root connection to be initialized.
InternalClientConnection.getRootConnection();
@@ -9488,6 +9475,22 @@
}
+ // Install the default loggers so the startup messages
+ // will be printed.
+ TextErrorLogPublisher startupErrorLogPublisher = null;
+ TextDebugLogPublisher startupDebugLogPublisher = null;
+
+ startupErrorLogPublisher =
+ TextErrorLogPublisher.getStartupTextErrorPublisher(
+ new TextWriter.STDOUT());
+ ErrorLogger.addErrorLogPublisher(startupErrorLogPublisher);
+
+ startupDebugLogPublisher =
+ TextDebugLogPublisher.getStartupTextDebugPublisher(
+ new TextWriter.STDOUT());
+ DebugLogger.addDebugLogPublisher(startupDebugLogPublisher);
+
+
// Create an environment configuration for the server and populate a number
// of appropriate properties.
DirectoryEnvironmentConfig environmentConfig =
@@ -9556,6 +9559,9 @@
stackTraceToSingleLineString(e));
shutDown(directoryServer.getClass().getName(), message);
}
+
+ ErrorLogger.removeErrorLogPublisher(startupErrorLogPublisher);
+ DebugLogger.removeDebugLogPublisher(startupDebugLogPublisher);
}
/**
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/ErrorLogger.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/ErrorLogger.java
index 7082c56..5732757 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/ErrorLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/ErrorLogger.java
@@ -27,8 +27,6 @@
package org.opends.server.loggers;
import org.opends.messages.Message;
-
-
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.List;
import java.util.ArrayList;
@@ -76,14 +74,6 @@
// The singleton instance of this class for configuration purposes.
private static final ErrorLogger instance = new ErrorLogger();
- static
- {
- // Add the default publisher to stdout.
- addErrorLogPublisher(
- TextErrorLogPublisher.getStartupTextErrorPublisher(
- new TextWriter.STDOUT()));
- }
-
/**
* Retrieve the singleton instance of this class.
*
@@ -138,19 +128,6 @@
}
/**
- * Removes first error log publisher from the logger.
- */
- public synchronized static void removeFirstErrorLogPublisher()
- {
- if(!errorPublishers.isEmpty())
- {
- ErrorLogPublisher publisher = errorPublishers.remove(0);
-
- publisher.close();
- }
- }
-
- /**
* Initializes all the error log publishers.
*
* @param configs The error log publisher configurations.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogger.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogger.java
index 37be564..37455d6 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogger.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/debug/DebugLogger.java
@@ -93,14 +93,6 @@
// The singleton instance of this class for configuration purposes.
static final DebugLogger instance = new DebugLogger();
- static
- {
- // Add the default publisher to stdout.
- addDebugLogPublisher(
- TextDebugLogPublisher.getStartupTextDebugPublisher(
- new TextWriter.STDOUT()));
- }
-
/**
* Add an debug log publisher to the debug logger.
*
@@ -160,26 +152,6 @@
}
/**
- * Removes first debug log publisher from the logger.
- */
- public synchronized static void removeFirstDebugLogPublisher()
- {
- if(!debugPublishers.isEmpty())
- {
- DebugLogPublisher publisher = debugPublishers.remove(0);
-
- publisher.close();
- }
-
- updateTracerSettings();
-
- if(debugPublishers.isEmpty())
- {
- enabled = false;
- }
- }
-
- /**
* Initializes all the debug log publishers.
*
* @param configs The debug log publisher configurations.
diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
index 49a34b4..0e8cd78 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationBackend.java
@@ -26,8 +26,8 @@
*/
package org.opends.server.replication.server;
import static org.opends.messages.BackendMessages.*;
-import static org.opends.messages.JebMessages.INFO_JEB_EXPORT_FINAL_STATUS;
-import static org.opends.messages.JebMessages.INFO_JEB_EXPORT_PROGRESS_REPORT;
+import static org.opends.messages.JebMessages.NOTE_JEB_EXPORT_FINAL_STATUS;
+import static org.opends.messages.JebMessages.NOTE_JEB_EXPORT_PROGRESS_REPORT;
import static org.opends.messages.ReplicationMessages.*;
import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
@@ -634,7 +634,7 @@
rate = 1000f*exportedCount / totalTime;
}
- Message message = INFO_JEB_EXPORT_FINAL_STATUS.get(
+ Message message = NOTE_JEB_EXPORT_FINAL_STATUS.get(
exportedCount, skippedCount, totalTime/1000, rate);
logError(message);
}
@@ -1123,7 +1123,7 @@
float rate = 1000f*deltaCount / deltaTime;
Message message =
- INFO_JEB_EXPORT_PROGRESS_REPORT.get(latestCount, skippedCount, rate);
+ NOTE_JEB_EXPORT_PROGRESS_REPORT.get(latestCount, skippedCount, rate);
logError(message);
previousCount = latestCount;
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java b/opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java
index 466bf46..d26e4d9 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/BackUpDB.java
@@ -42,14 +42,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.TextErrorLogPublisher;
+import org.opends.server.loggers.ErrorLogger;
+import org.opends.server.loggers.debug.TextDebugLogPublisher;
+import org.opends.server.loggers.debug.DebugLogger;
import static org.opends.server.loggers.ErrorLogger.*;
import org.opends.server.types.BackupConfig;
import org.opends.server.types.BackupDirectory;
@@ -84,7 +88,6 @@
*/
public class BackUpDB extends TaskTool
{
- private static ErrorLogPublisher errorLogPublisher = null;
/**
* The main method for BackUpDB tool.
*
@@ -94,11 +97,6 @@
{
int retCode = mainBackUpDB(args, true, System.out, System.err);
- if(errorLogPublisher != null)
- {
- removeErrorLogPublisher(errorLogPublisher);
- }
-
if(retCode != 0)
{
System.exit(filterExitCode(retCode));
@@ -704,16 +702,16 @@
return 1;
}
-
- // FIXME -- Install a custom logger to capture information about the state
- // of the export.
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)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java
index 7f4f644..5e48861 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ExportLDIF.java
@@ -34,6 +34,7 @@
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.*;
@@ -41,8 +42,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.types.AttributeType;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.DN;
@@ -80,8 +84,6 @@
*/
public class ExportLDIF extends TaskTool {
- private static ErrorLogPublisher errorLogPublisher = null;
-
/**
* The main method for ExportLDIF tool.
*
@@ -91,11 +93,6 @@
{
int retCode = mainExportLDIF(args, true, System.out, System.err);
- if(errorLogPublisher != null)
- {
- removeErrorLogPublisher(errorLogPublisher);
- }
-
if(retCode != 0)
{
System.exit(filterExitCode(retCode));
@@ -614,15 +611,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));
- 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)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java
index e8ec74b..f242747 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opendj-sdk/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));
}
}
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/RebuildIndex.java b/opendj-sdk/opends/src/server/org/opends/server/tools/RebuildIndex.java
index c4cc2f3..7390896 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/RebuildIndex.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/RebuildIndex.java
@@ -37,9 +37,11 @@
import static org.opends.messages.ToolMessages.*;
import org.opends.server.config.ConfigException;
import static org.opends.server.loggers.ErrorLogger.logError;
-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 static org.opends.server.util.ServerConstants.*;
import static org.opends.server.util.StaticUtils.*;
import org.opends.server.core.DirectoryServer;
@@ -48,6 +50,7 @@
import org.opends.server.types.*;
import org.opends.server.api.Backend;
import org.opends.server.api.ErrorLogPublisher;
+import org.opends.server.api.DebugLogPublisher;
import org.opends.server.backends.jeb.BackendImpl;
import org.opends.server.backends.jeb.RebuildConfig;
import org.opends.server.admin.std.server.BackendCfg;
@@ -66,7 +69,6 @@
*/
public class RebuildIndex
{
- private static ErrorLogPublisher errorLogPublisher = null;
/**
* Processes the command-line arguments and invokes the rebuild process.
@@ -77,11 +79,6 @@
{
int retCode = mainRebuildIndex(args, true, System.out, System.err);
- if(errorLogPublisher != null)
- {
- ErrorLogger.removeErrorLogPublisher(errorLogPublisher);
- }
-
if(retCode != 0)
{
System.exit(filterExitCode(retCode));
@@ -357,15 +354,16 @@
- // FIXME -- Install a custom logger to capture information about the state
- // of the verify process.
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)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java b/opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java
index c97e3a9..aad5a92 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/RestoreDB.java
+++ b/opendj-sdk/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)
{
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java b/opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java
index 5150bd1..ffb168d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/VerifyIndex.java
@@ -38,9 +38,9 @@
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.DirectoryException;
@@ -75,8 +75,6 @@
*/
public class VerifyIndex
{
- private static ErrorLogPublisher errorLogPublisher = null;
- private static DebugLogPublisher debugLogPublisher = null;
/**
* Processes the command-line arguments and invokes the verify process.
*
@@ -86,15 +84,6 @@
{
int retCode = mainVerifyIndex(args, true, System.out, System.err);
- if(errorLogPublisher != null)
- {
- ErrorLogger.removeErrorLogPublisher(errorLogPublisher);
- }
- if(debugLogPublisher != null)
- {
- DebugLogger.removeDebugLogPublisher(debugLogPublisher);
- }
-
if(retCode != 0)
{
System.exit(filterExitCode(retCode));
@@ -387,20 +376,16 @@
}
- // FIXME -- Install a custom logger to capture information about the state
- // of the verify process.
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);
-
- debugLogPublisher =
- TextDebugLogPublisher.getStartupTextDebugPublisher(
- new TextWriter.STDOUT());
DebugLogger.addDebugLogPublisher(debugLogPublisher);
-
}
catch(Exception e)
{
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index ae47e64..822809f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -48,20 +48,14 @@
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
import java.util.logging.ConsoleHandler;
import java.util.logging.Handler;
import java.util.logging.LogManager;
import java.util.logging.Logger;
import org.opends.messages.Message;
+import org.opends.messages.Severity;
import org.opends.server.admin.client.ManagementContext;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
import org.opends.server.admin.client.ldap.LDAPConnection;
@@ -379,17 +373,14 @@
config.setConfigClass(ConfigFileHandler.class);
config.setConfigFile(new File(testConfigDir, "config.ldif"));
- AccessLogger.removeAllAccessLogPublishers();
AccessLogger.addAccessLogPublisher(
TextAccessLogPublisher.getStartupTextAccessPublisher(
ACCESS_TEXT_WRITER, false));
- ErrorLogger.removeAllErrorLogPublishers();
ErrorLogger.addErrorLogPublisher(
TextErrorLogPublisher.getStartupTextErrorPublisher(
ERROR_TEXT_WRITER));
- DebugLogger.removeAllDebugLogPublishers();
DebugLogger.addDebugLogPublisher(
TextDebugLogPublisher.getStartupTextDebugPublisher(
DEBUG_TEXT_WRITER));
--
Gitblit v1.10.0