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/backends/jeb/BackupManager.java | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
index a546705..a71831b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java
@@ -53,7 +53,6 @@
import java.util.zip.ZipOutputStream;
import org.opends.server.types.*;
-import static org.opends.server.loggers.ErrorLogger.logError;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.JebMessages.*;
import static org.opends.server.util.ServerConstants.*;
@@ -218,9 +217,7 @@
// No incremental backup ID: log a message informing that a backup
// could not be found and that a normal backup will be done.
incremental = false;
- LocalizableMessage message = WARN_BACKUPDB_INCREMENTAL_NOT_FOUND_DOING_NORMAL.get(
- backupDir.getPath());
- logError(message);
+ logger.warn(WARN_BACKUPDB_INCREMENTAL_NOT_FOUND_DOING_NORMAL, backupDir.getPath());
}
else
{
@@ -395,8 +392,7 @@
break;
}
- message = NOTE_JEB_BACKUP_FILE_UNCHANGED.get(logFileName);
- logError(message);
+ logger.info(NOTE_JEB_BACKUP_FILE_UNCHANGED, logFileName);
unchangedList.add(logFileName);
@@ -493,9 +489,7 @@
Arrays.sort(logFiles);
- message = NOTE_JEB_BACKUP_CLEANER_ACTIVITY.get(
- String.valueOf(logFiles.length));
- logError(message);
+ logger.info(NOTE_JEB_BACKUP_CLEANER_ACTIVITY, String.valueOf(logFiles.length));
}
else
{
@@ -921,8 +915,7 @@
{
if (verifyOnly)
{
- LocalizableMessage message = NOTE_JEB_BACKUP_VERIFY_FILE.get(zipEntry.getName());
- logError(message);
+ logger.info(NOTE_JEB_BACKUP_VERIFY_FILE, zipEntry.getName());
}
// The file name is part of the hash.
@@ -966,9 +959,7 @@
{
outputStream.close();
- LocalizableMessage message = NOTE_JEB_BACKUP_RESTORED_FILE.get(
- zipEntry.getName(), totalBytesRead);
- logError(message);
+ logger.info(NOTE_JEB_BACKUP_RESTORED_FILE, zipEntry.getName(), totalBytesRead);
}
}
@@ -1063,8 +1054,7 @@
// Finish the zip entry.
zipStream.closeEntry();
- LocalizableMessage message = NOTE_JEB_BACKUP_ARCHIVED_FILE.get(zipEntry.getName());
- logError(message);
+ logger.info(NOTE_JEB_BACKUP_ARCHIVED_FILE, zipEntry.getName());
return totalBytesRead;
}
--
Gitblit v1.10.0