From ecfef39261a93e691fd5e52a2ce0b4b88a032bef Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Thu, 24 Jan 2008 17:19:15 +0000
Subject: [PATCH] Improved error handling in logger retention policy enforcement. The rotater thread will now handle exceptions rasied during rotation and/or retention runs.
---
opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java b/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
index 0e723af..2822d08 100644
--- a/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
+++ b/opends/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java
@@ -22,10 +22,11 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2006-2007 Sun Microsystems, Inc.
+ * Portions Copyright 2006-2008 Sun Microsystems, Inc.
*/
package org.opends.server.loggers;
import org.opends.messages.Message;
+import static org.opends.messages.LoggerMessages.ERR_LOGGER_ERROR_LISTING_FILES;
import org.opends.server.admin.std.server.SizeLimitLogRetentionPolicyCfg;
import org.opends.server.admin.server.ConfigurationChangeListener;
@@ -33,6 +34,8 @@
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.ResultCode;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.core.DirectoryServer;
import java.io.File;
@@ -53,8 +56,8 @@
*/
private static final DebugTracer TRACER = getTracer();
-
private long size = 0;
+ private SizeLimitLogRetentionPolicyCfg config;
/**
* {@inheritDoc}
@@ -62,7 +65,8 @@
public void initializeLogRetentionPolicy(
SizeLimitLogRetentionPolicyCfg config)
{
- size = config.getDiskSpaceUsed();
+ this.size = config.getDiskSpaceUsed();
+ this.config = config;
config.addSizeLimitChangeListener(this);
}
@@ -89,7 +93,8 @@
boolean adminActionRequired = false;
ArrayList<Message> messages = new ArrayList<Message>();
- size = config.getDiskSpaceUsed();
+ this.size = config.getDiskSpaceUsed();
+ this.config = config;
return new ConfigChangeResult(resultCode, adminActionRequired, messages);
}
@@ -97,10 +102,20 @@
/**
* {@inheritDoc}
*/
- public int deleteFiles(MultifileTextWriter writer)
+ public File[] deleteFiles(FileNamingPolicy fileNamingPolicy)
+ throws DirectoryException
{
- File[] files = writer.getNamingPolicy().listFiles();
- int count = 0;
+ File[] files = fileNamingPolicy.listFiles();
+ if(files == null)
+ {
+ Message message =
+ ERR_LOGGER_ERROR_LISTING_FILES.get(
+ fileNamingPolicy.getInitialName().toString());
+ throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
+ message);
+ }
+
+ ArrayList<File> filesToDelete = new ArrayList<File>();
long totalLength = 0;
for (File file : files)
@@ -115,7 +130,7 @@
if (totalLength <= size)
{
- return 0;
+ return new File[0];
}
long freeSpaceNeeded = totalLength - size;
@@ -127,21 +142,22 @@
for (int j = files.length - 1; j < 1; j--)
{
freedSpace += files[j].length();
- if(debugEnabled())
- {
- TRACER.debugInfo("Deleting log file:", files[j]);
- }
- files[j].delete();
+ filesToDelete.add(files[j]);
if (freedSpace >= freeSpaceNeeded)
{
break;
}
-
- count++;
}
- return count;
+ return filesToDelete.toArray(new File[0]);
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return "Size Based Retention Policy " + config.dn().toString();
+ }
}
--
Gitblit v1.10.0