From 407c33f7cfd2c6afe3fb304fb0efbb983e0b317b Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 10 Feb 2014 10:43:22 +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/TextErrorLogPublisher.java | 45 +++++++++++++++------------------------------
1 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
index 83b37c9..10a9a7c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
@@ -109,8 +109,7 @@
TextErrorLogPublisher startupPublisher = new TextErrorLogPublisher();
startupPublisher.writer = writer;
startupPublisher.defaultSeverities.addAll(Arrays.asList(
- Severity.FATAL_ERROR, Severity.SEVERE_ERROR, Severity.SEVERE_WARNING,
- Severity.NOTICE));
+ Severity.ERROR, Severity.WARNING, Severity.NOTICE));
return startupPublisher;
}
@@ -187,22 +186,18 @@
config.getDefaultSeverity();
if(defSevs.isEmpty())
{
- defaultSeverities.add(Severity.FATAL_ERROR);
- defaultSeverities.add(Severity.SEVERE_ERROR);
- defaultSeverities.add(Severity.SEVERE_WARNING);
+ defaultSeverities.add(Severity.ERROR);
+ defaultSeverities.add(Severity.WARNING);
} else
{
for(ErrorLogPublisherCfgDefn.DefaultSeverity defSev : defSevs)
{
if(defSev.toString().equalsIgnoreCase(LOG_SEVERITY_ALL))
{
- defaultSeverities.add(Severity.FATAL_ERROR);
- defaultSeverities.add(Severity.INFORMATION);
- defaultSeverities.add(Severity.MILD_ERROR);
- defaultSeverities.add(Severity.MILD_WARNING);
+ defaultSeverities.add(Severity.ERROR);
+ defaultSeverities.add(Severity.WARNING);
defaultSeverities.add(Severity.NOTICE);
- defaultSeverities.add(Severity.SEVERE_ERROR);
- defaultSeverities.add(Severity.SEVERE_WARNING);
+ defaultSeverities.add(Severity.INFORMATION);
}
else if (defSev.toString().equalsIgnoreCase(LOG_SEVERITY_NONE))
{
@@ -245,13 +240,10 @@
severityName = severityName.replace("-", "_").toUpperCase();
if(severityName.equalsIgnoreCase(LOG_SEVERITY_ALL))
{
- severities.add(Severity.FATAL_ERROR);
- severities.add(Severity.INFORMATION);
- severities.add(Severity.MILD_ERROR);
- severities.add(Severity.MILD_WARNING);
+ severities.add(Severity.ERROR);
+ severities.add(Severity.WARNING);
severities.add(Severity.NOTICE);
- severities.add(Severity.SEVERE_ERROR);
- severities.add(Severity.SEVERE_WARNING);
+ severities.add(Severity.INFORMATION);
}
else
{
@@ -382,22 +374,18 @@
defaultSeverities.clear();
if(defSevs.isEmpty())
{
- defaultSeverities.add(Severity.FATAL_ERROR);
- defaultSeverities.add(Severity.SEVERE_ERROR);
- defaultSeverities.add(Severity.SEVERE_WARNING);
+ defaultSeverities.add(Severity.ERROR);
+ defaultSeverities.add(Severity.WARNING);
} else
{
for(ErrorLogPublisherCfgDefn.DefaultSeverity defSev : defSevs)
{
if(defSev.toString().equalsIgnoreCase(LOG_SEVERITY_ALL))
{
- defaultSeverities.add(Severity.FATAL_ERROR);
+ defaultSeverities.add(Severity.ERROR);
+ defaultSeverities.add(Severity.WARNING);
defaultSeverities.add(Severity.INFORMATION);
- defaultSeverities.add(Severity.MILD_ERROR);
- defaultSeverities.add(Severity.MILD_WARNING);
defaultSeverities.add(Severity.NOTICE);
- defaultSeverities.add(Severity.SEVERE_ERROR);
- defaultSeverities.add(Severity.SEVERE_WARNING);
}
else if (defSev.toString().equalsIgnoreCase(LOG_SEVERITY_NONE))
{
@@ -441,13 +429,10 @@
severityName = severityName.replace("-", "_").toUpperCase();
if(severityName.equalsIgnoreCase(LOG_SEVERITY_ALL))
{
- severities.add(Severity.FATAL_ERROR);
+ severities.add(Severity.ERROR);
severities.add(Severity.INFORMATION);
- severities.add(Severity.MILD_ERROR);
- severities.add(Severity.MILD_WARNING);
+ severities.add(Severity.WARNING);
severities.add(Severity.NOTICE);
- severities.add(Severity.SEVERE_ERROR);
- severities.add(Severity.SEVERE_WARNING);
}
else
{
--
Gitblit v1.10.0