From 1d5d1a6a4a0a58d6bb4803527dacb6641c027816 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 28 Jan 2014 13:34:12 +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/loggers/MultifileTextWriter.java | 45 +++++++++++----------------------------------
1 files changed, 11 insertions(+), 34 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java b/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
index a960e30..e5748ac 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/MultifileTextWriter.java
@@ -35,12 +35,12 @@
import org.opends.server.admin.std.server.SizeLimitLogRotationPolicyCfg;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.util.TimeThread;
-import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import org.opends.server.loggers.debug.DebugTracer;
+import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import static org.opends.messages.LoggerMessages.*;
+
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import java.io.*;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -61,10 +61,8 @@
implements ServerShutdownListener, TextWriter,
ConfigurationChangeListener<SizeLimitLogRotationPolicyCfg>
{
- /**
- * The tracer object for the debug logger.
- */
- private static final DebugTracer TRACER = getTracer();
+
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
private static final String UTF8_ENCODING= "UTF-8";
@@ -181,7 +179,6 @@
outputStream = new MeteredStream(stream, file.length());
OutputStreamWriter osw = new OutputStreamWriter(outputStream, encoding);
- BufferedWriter bw = null;
if(bufferSize <= 0)
{
writer = new BufferedWriter(osw);
@@ -434,10 +431,7 @@
}
catch(Exception e)
{
- if (debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
}
for(RotationPolicy rotationPolicy : rotationPolicies)
@@ -459,11 +453,7 @@
{
file.delete();
totalFilesCleaned++;
- if(debugEnabled())
- {
- TRACER.debugInfo(retentionPolicy.toString() +
- " cleaned up log file %s", file.toString());
- }
+ logger.trace("%s cleaned up log file %s", retentionPolicy, file);
}
if(files.length > 0)
@@ -474,10 +464,7 @@
}
catch(DirectoryException de)
{
- if(debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, de);
- }
+ logger.traceException(de);
errorHandler.handleDeleteError(retentionPolicy, de);
}
}
@@ -639,10 +626,7 @@
}
catch(Exception e)
{
- if(debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
errorHandler.handleCloseError(e);
}
@@ -657,10 +641,7 @@
}
catch (Exception e)
{
- if(debugEnabled())
- {
- TRACER.debugCaught(DebugLogLevel.ERROR, e);
- }
+ logger.traceException(e);
errorHandler.handleOpenError(currentFile, e);
}
@@ -668,12 +649,8 @@
// new RotationActionThread(newFile, actions, configEntry);
//rotThread.start();
- if(debugEnabled())
- {
- TRACER.debugInfo("Log file %s rotated and renamed to %s",
+ logger.trace("Log file %s rotated and renamed to %s",
currentFile, newFile);
- }
-
totalFilesRotated++;
lastRotationTime = TimeThread.getCalendar();
}
--
Gitblit v1.10.0