From a06fd90c9b6bfb5f9130146373ba18e5769593b6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 29 Jan 2014 11:30:37 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java b/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
index a874831..1b7b831 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/FileSystemEntryCache.java
@@ -74,7 +74,6 @@
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.ServerConstants;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.config.ConfigConstants.*;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
@@ -328,8 +327,7 @@
INDEXKEY.getBytes("UTF-8"));
// Persistent state report.
- LocalizableMessage message = NOTE_FSCACHE_RESTORE.get();
- logError(message);
+ logger.info(NOTE_FSCACHE_RESTORE);
if (OperationStatus.SUCCESS ==
entryCacheDB.get(null, indexKey, indexData, LockMode.DEFAULT)) {
@@ -364,7 +362,7 @@
// Remove cache entries specific to this backend.
clearBackend(DirectoryServer.getBackend(backend));
// Log an error message.
- logError(WARN_FSCACHE_OFFLINE_STATE_FAIL.get(backend));
+ logger.warn(WARN_FSCACHE_OFFLINE_STATE_FAIL.get(backend));
}
}
// Pop max entries limit.
@@ -372,15 +370,13 @@
}
// Persistent state report.
- message = NOTE_FSCACHE_RESTORE_REPORT.get(
- entryCacheIndex.dnMap.size());
- logError(message);
+ logger.info(NOTE_FSCACHE_RESTORE_REPORT, entryCacheIndex.dnMap.size());
} catch (CacheIndexNotFoundException e) {
logger.traceException(e);
// Log an error message.
- logError(NOTE_FSCACHE_INDEX_NOT_FOUND.get());
+ logger.info(NOTE_FSCACHE_INDEX_NOT_FOUND.get());
// Clear the entry cache.
clear();
@@ -388,7 +384,7 @@
logger.traceException(e);
// Log an error message.
- logError(ERR_FSCACHE_INDEX_IMPAIRED.get());
+ logger.error(ERR_FSCACHE_INDEX_IMPAIRED.get());
// Clear the entry cache.
clear();
@@ -396,7 +392,7 @@
logger.traceException(e);
// Log an error message.
- logError(ERR_FSCACHE_CANNOT_LOAD_PERSISTENT_DATA.get());
+ logger.error(ERR_FSCACHE_CANNOT_LOAD_PERSISTENT_DATA.get());
// Clear the entry cache.
clear();
@@ -443,8 +439,7 @@
DatabaseEntry indexData = new DatabaseEntry();
// Persistent state save report.
- LocalizableMessage message = NOTE_FSCACHE_SAVE.get();
- logError(message);
+ logger.info(NOTE_FSCACHE_SAVE);
//This line causes an unchecked call error if the SuppressWarnings
//annotation is removed at the beginning of this method.
entryCacheDataBinding.objectToEntry(entryCacheIndex, indexData);
@@ -458,13 +453,11 @@
logger.traceException(e);
// Log an error message.
- logError(ERR_FSCACHE_CANNOT_STORE_PERSISTENT_DATA.get());
+ logger.error(ERR_FSCACHE_CANNOT_STORE_PERSISTENT_DATA.get());
}
// Persistent state save report.
- LocalizableMessage message = NOTE_FSCACHE_SAVE_REPORT.get(
- entryCacheIndex.dnMap.size());
- logError(message);
+ logger.info(NOTE_FSCACHE_SAVE_REPORT, entryCacheIndex.dnMap.size());
}
// Close JE databases and environment and clear all the maps.
@@ -1294,7 +1287,7 @@
logger.traceException(e);
// Log an error message.
- logError(ERR_FSCACHE_CANNOT_RETRIEVE_ENTRY.get());
+ logger.error(ERR_FSCACHE_CANNOT_RETRIEVE_ENTRY.get());
}
return null;
}
@@ -1379,7 +1372,7 @@
logger.traceException(e);
// Log an error message.
- logError(
+ logger.error(
ERR_FSCACHE_CANNOT_STORE_ENTRY.get());
return false;
@@ -1425,8 +1418,7 @@
}
} catch(Exception e) {
// Log a warning that the permissions were not set.
- LocalizableMessage message = WARN_FSCACHE_SET_PERMISSIONS_FAILED.get(cacheHome);
- logError(message);
+ logger.warn(WARN_FSCACHE_SET_PERMISSIONS_FAILED, cacheHome);
}
}
} else {
--
Gitblit v1.10.0