From 1a3a07f47d0c6e9452e39dd0472a3356434782bf Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 29 Apr 2010 15:34:27 +0000
Subject: [PATCH] Batch of changes that : - Update BDB JE to version 4.0.95 - Remove BDB logging configuration and definitely fix issue 4367  - Resolve issue 4523 - ACI and sub-entry caches not updated on replicas - Update the build factory to warn about generated messages on precommit - Resolve some issues in the Control Panel - Fix an issue with java.properties being ignored by some CLI

---
 opends/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/opends/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java b/opends/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java
index 9fcaf4d..1a0d11a 100644
--- a/opends/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java
+++ b/opends/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2006-2009 Sun Microsystems, Inc.
+ *      Copyright 2006-2010 Sun Microsystems, Inc.
  */
 package org.opends.server.backends.jeb;
 
@@ -43,6 +43,8 @@
 import java.util.StringTokenizer;
 import java.util.List;
 import java.util.Arrays;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.opends.messages.Message;
 import static org.opends.messages.JebMessages.*;
@@ -492,6 +494,32 @@
       envConfig.setConfigParam(jeProperty, value);
     }
 
+    // Set logging and file handler levels.
+    Logger parent = Logger.getLogger("com.sleepycat.je");
+    try
+    {
+      parent.setLevel(Level.parse(cfg.getDBLoggingLevel()));
+    }
+    catch (Exception e)
+    {
+      throw new ConfigException(
+              ERR_JEB_INVALID_LOGGING_LEVEL.get(
+              String.valueOf(cfg.getDBLoggingLevel()),
+              String.valueOf(cfg.dn())));
+    }
+    if (cfg.isDBLoggingFileHandlerOn())
+    {
+      envConfig.setConfigParam(
+              EnvironmentConfig.FILE_LOGGING_LEVEL,
+              Level.ALL.getName());
+    }
+    else
+    {
+      envConfig.setConfigParam(
+              EnvironmentConfig.FILE_LOGGING_LEVEL,
+              Level.OFF.getName());
+    }
+
     // See if there are any native JE properties specified in the config
     // and if so try to parse, evaluate and set them.
     SortedSet<String> jeProperties = cfg.getJEProperty();

--
Gitblit v1.10.0