From 6812cefe6168c6a6142a9633138c0f07ae135dd5 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 31 Jan 2014 14:55:30 +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/tools/ConsoleDebugLogPublisher.java | 35 +++--------------------------------
1 files changed, 3 insertions(+), 32 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ConsoleDebugLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/tools/ConsoleDebugLogPublisher.java
index 37a8a39..1531c71 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ConsoleDebugLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ConsoleDebugLogPublisher.java
@@ -36,10 +36,8 @@
import org.opends.server.core.ServerContext;
import org.opends.server.loggers.DebugMessageFormatter;
import org.opends.server.loggers.DebugStackTraceFormatter;
-import org.opends.server.loggers.LogCategory;
import org.opends.server.loggers.TraceSettings;
import org.opends.server.types.DN;
-import org.opends.server.types.DebugLogCategory;
import org.opends.server.types.InitializationException;
import org.opends.server.util.ServerConstants;
@@ -89,14 +87,12 @@
String msg,
StackTraceElement[] stackTrace)
{
- LogCategory category = DebugLogCategory.MESSAGE;
-
String stack = null;
if(stackTrace != null)
{
stack = DebugStackTraceFormatter.formatStackTrace(stackTrace, settings.getStackDepth());
}
- publish(category, msg, stack);
+ publish(msg, stack);
}
/**
@@ -109,8 +105,6 @@
String msg,
Throwable ex, StackTraceElement[] stackTrace)
{
- LogCategory category = DebugLogCategory.CAUGHT;
-
String message = DebugMessageFormatter.format("%s caught={%s} %s(): %s",
new Object[] { msg, ex, signature, sourceLocation });
@@ -121,7 +115,7 @@
DebugStackTraceFormatter.formatStackTrace(ex, settings
.getStackDepth(), settings.isIncludeCause());
}
- publish(category, message, stack);
+ publish(message, stack);
}
/**
@@ -136,17 +130,13 @@
// Publishes a record, optionally performing some "special" work:
// - injecting a stack trace into the message
- private void publish(LogCategory category, String msg, String stack)
+ private void publish(String msg, String stack)
{
StringBuilder buf = new StringBuilder();
// Emit the timestamp.
buf.append(dateFormat.format(System.currentTimeMillis()));
buf.append(" ");
- // Emit debug category.
- buf.append(category);
- buf.append(" ");
-
// Emit the debug level.
buf.append("TRACE ");
@@ -164,25 +154,6 @@
err.print(buf);
}
- private String buildDefaultEntryMessage(String signature,
- String sourceLocation, Object[] args)
- {
- StringBuilder format = new StringBuilder();
- format.append(signature);
- format.append("(");
- for (int i = 0; i < args.length; i++)
- {
- if (i != 0) format.append(", ");
- format.append("arg");
- format.append(i + 1);
- format.append("={%s}");
- }
- format.append("):");
- format.append(sourceLocation);
-
- return DebugMessageFormatter.format(format.toString(), args);
- }
-
/**
* {@inheritDoc}
*/
--
Gitblit v1.10.0