From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opends/src/server/org/opends/server/loggers/TextErrorLogPublisher.java | 107 +++++++++--------------------------------------------
1 files changed, 18 insertions(+), 89 deletions(-)
diff --git a/opends/src/server/org/opends/server/loggers/TextErrorLogPublisher.java b/opends/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
index f3de68a..72791c4 100644
--- a/opends/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
+++ b/opends/src/server/org/opends/server/loggers/TextErrorLogPublisher.java
@@ -96,7 +96,7 @@
try
{
FilePermission perm =
- FilePermission.decodeUNIXMode(config.getLogFileMode());
+ FilePermission.decodeUNIXMode(config.getLogFilePermissions());
LogPublisherErrorHandler errorHandler =
new LogPublisherErrorHandler(config.dn());
@@ -117,33 +117,14 @@
(int)config.getBufferSize());
// Validate retention and rotation policies.
- for(DN dn : config.getRotationPolicyDN())
+ for(DN dn : config.getRotationPolicyDNs())
{
- RotationPolicy policy = DirectoryServer.getRotationPolicy(dn);
- if(policy != null)
- {
- writer.addRotationPolicy(policy);
- }
- else
- {
- Message message = ERR_CONFIG_LOGGER_INVALID_ROTATION_POLICY.get(
- dn.toString(), config.dn().toString());
- throw new ConfigException(message);
- }
+ writer.addRotationPolicy(DirectoryServer.getRotationPolicy(dn));
}
- for(DN dn: config.getRetentionPolicyDN())
+
+ for(DN dn: config.getRetentionPolicyDNs())
{
- RetentionPolicy policy = DirectoryServer.getRetentionPolicy(dn);
- if(policy != null)
- {
- writer.addRetentionPolicy(policy);
- }
- else
- {
- Message message = WARN_CONFIG_LOGGER_INVALID_RETENTION_POLICY.get(
- dn.toString(), config.dn().toString());
- throw new ConfigException(message);
- }
+ writer.addRetentionPolicy(DirectoryServer.getRetentionPolicy(dn));
}
if(config.isAsynchronous())
@@ -292,32 +273,6 @@
FileBasedErrorLogPublisherCfg config =
(FileBasedErrorLogPublisherCfg) configuration;
- // Validate retention and rotation policies.
- for(DN dn : config.getRotationPolicyDN())
- {
- RotationPolicy policy = DirectoryServer.getRotationPolicy(dn);
- if(policy == null)
- {
- Message message = ERR_CONFIG_LOGGER_INVALID_ROTATION_POLICY.get(
- dn.toString(),
- config.dn().toString());
- unacceptableReasons.add(message);
- return false;
- }
- }
- for(DN dn: config.getRetentionPolicyDN())
- {
- RetentionPolicy policy = DirectoryServer.getRetentionPolicy(dn);
- if(policy == null)
- {
- Message message = WARN_CONFIG_LOGGER_INVALID_RETENTION_POLICY.get(
- dn.toString(),
- config.dn().toString());
- unacceptableReasons.add(message);
- return false;
- }
- }
-
for(String overrideSeverity : config.getOverrideSeverity())
{
if(overrideSeverity != null)
@@ -333,11 +288,10 @@
} else
{
String categoryName = overrideSeverity.substring(0, equalPos);
- Category category;
categoryName = categoryName.replace("-", "_").toUpperCase();
try
{
- category = Category.valueOf(categoryName);
+ Category.valueOf(categoryName);
}
catch(Exception e)
{
@@ -355,8 +309,7 @@
{
try
{
- Severity severity =
- Severity.parseString(severityName);
+ Severity.parseString(severityName);
}
catch(Exception e)
{
@@ -382,10 +335,10 @@
// Make sure the permission is valid.
try
{
- if(!currentConfig.getLogFileMode().equalsIgnoreCase(
- config.getLogFileMode()))
+ if(!currentConfig.getLogFilePermissions().equalsIgnoreCase(
+ config.getLogFilePermissions()))
{
- FilePermission.decodeUNIXMode(config.getLogFileMode());
+ FilePermission.decodeUNIXMode(config.getLogFilePermissions());
}
if(!currentConfig.getLogFile().equalsIgnoreCase(config.getLogFile()))
{
@@ -530,7 +483,7 @@
try
{
FilePermission perm =
- FilePermission.decodeUNIXMode(config.getLogFileMode());
+ FilePermission.decodeUNIXMode(config.getLogFilePermissions());
boolean writerAutoFlush =
config.isAutoFlush() && !config.isAsynchronous();
@@ -561,39 +514,15 @@
mfWriter.removeAllRetentionPolicies();
mfWriter.removeAllRotationPolicies();
- for(DN dn : config.getRotationPolicyDN())
+ for(DN dn : config.getRotationPolicyDNs())
{
- RotationPolicy policy = DirectoryServer.getRotationPolicy(dn);
- if(policy != null)
- {
- mfWriter.addRotationPolicy(policy);
- }
- else
- {
- Message message = ERR_CONFIG_LOGGER_INVALID_ROTATION_POLICY.get(
- dn.toString(),
- config.dn().toString());
- resultCode = DirectoryServer.getServerErrorResultCode();
- messages.add(message);
- }
- }
- for(DN dn: config.getRetentionPolicyDN())
- {
- RetentionPolicy policy = DirectoryServer.getRetentionPolicy(dn);
- if(policy != null)
- {
- mfWriter.addRetentionPolicy(policy);
- }
- else
- {
- Message message = WARN_CONFIG_LOGGER_INVALID_RETENTION_POLICY.get(
- dn.toString(),
- config.dn().toString());
- resultCode = DirectoryServer.getServerErrorResultCode();
- messages.add(message);
- }
+ mfWriter.addRotationPolicy(DirectoryServer.getRotationPolicy(dn));
}
+ for(DN dn: config.getRetentionPolicyDNs())
+ {
+ mfWriter.addRetentionPolicy(DirectoryServer.getRetentionPolicy(dn));
+ }
if(writer instanceof AsyncronousTextWriter && !config.isAsynchronous())
{
--
Gitblit v1.10.0