From ae3f32395e2572bfefe3381a2d2caa385f6968a4 Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Tue, 22 May 2007 16:02:03 +0000
Subject: [PATCH] Fixed issue where the server issued warnings about setting file permissions on startup on Windows platforms. This applies for the DB directory and log file permissions. With Java 6, it is impossible to set a read and execute permission to false on Windows. The file permissions class now takes this into account and does not consider a false result from setting read and execute permissions to false on Windows a failure.
---
opendj-sdk/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java b/opendj-sdk/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java
index 6e1dec4..ef50064 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/loggers/MultifileTextWriter.java
@@ -31,13 +31,17 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.*;
import org.opends.server.types.FilePermission;
+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.debugEnabled;
import static org.opends.server.loggers.debug.DebugLogger.debugVerbose;
import static org.opends.server.loggers.debug.DebugLogger.debugCaught;
-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.messages.LoggerMessages.*;
+import static org.opends.server.messages.MessageHandler.*;
+import static org.opends.server.loggers.ErrorLogger.*;
import java.io.*;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -183,28 +187,32 @@
}
- // Try to apply file permissions. Causing problems with installer. Fix
- // after 0.8.
- /*
+ // Try to apply file permissions.
if(FilePermission.canSetPermissions())
{
try
{
if(!FilePermission.setPermissions(file, filePermissions))
{
- throw new Exception();
+ int msgID = MSGID_LOGGER_UNABLE_SET_PERMISSIONS;
+ String message = getMessage(msgID, filePermissions.toString(),
+ file.toString());
+ logError(ErrorLogCategory.CONFIGURATION,
+ ErrorLogSeverity.MILD_WARNING,
+ message, msgID);
}
}
catch(Exception e)
{
// Log an warning that the permissions were not set.
int msgID = MSGID_LOGGER_SET_PERMISSION_FAILED;
- String message = getMessage(msgID, file.toString());
+ String message = getMessage(msgID, file.toString(),
+ stackTraceToSingleLineString(e));
logError(ErrorLogCategory.CONFIGURATION,
ErrorLogSeverity.SEVERE_WARNING,
message, msgID);
}
- }*/
+ }
}
--
Gitblit v1.10.0