From a8f5d8345278d27ddf5325d3977e460b86b6275f Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Tue, 27 Apr 2010 20:56:50 +0000
Subject: [PATCH] Fixing several issues with the Control Panel, the QuickSetup, Core server and Replication. Also improves unit, functional tests. More specifically this commit resolves the following open issues: 4385 - NPE when using ExtensibleMatch filter without a matching rule 4521 - dynamic lookup in attribut selection when selecting the sort order attribut while defining VLV index 4531 - Control Panel creates virtual static groups using groupOfURLs as objectclass 4533 - NullPointerException when configuring replication between 2 OpenDS 4539 - DSML Gateway - jaxb.properties Exception
---
opends/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java b/opends/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java
index 3363e4c..fdd325e 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup;
@@ -58,11 +58,7 @@
logFile = file;
fileHandler = new FileHandler(logFile.getCanonicalPath());
fileHandler.setFormatter(new SimpleFormatter());
- Logger logger = Logger.getLogger("org.opends.quicksetup");
- logger.addHandler(fileHandler);
- logger = Logger.getLogger("org.opends.admin.ads");
- logger.addHandler(fileHandler);
- logger = Logger.getLogger("org.opends.server.admin.client.cli");
+ Logger logger = Logger.getLogger("org.opends");
logger.addHandler(fileHandler);
disableConsoleLogging();
logger = Logger.getLogger("org.opends.quicksetup");
@@ -83,7 +79,10 @@
initLogFileHandler(file);
Logger logger = Logger.getLogger(packageName);
logger.addHandler(fileHandler);
- logger.setUseParentHandlers(false);
+ if (disableLoggingToConsole())
+ {
+ logger.setUseParentHandlers(false); // disable logging to console
+ }
}
/**
@@ -91,14 +90,11 @@
* output.
*/
static public void disableConsoleLogging() {
- Logger logger = Logger.getLogger("org.opends.quicksetup");
- logger.setUseParentHandlers(false);
- logger = Logger.getLogger("org.opends.admin.ads");
- logger.setUseParentHandlers(false);
- logger = Logger.getLogger("org.opends.server.tools");
- logger.setUseParentHandlers(false);
- logger = Logger.getLogger("org.opends.server.admin.client.cli");
- logger.setUseParentHandlers(false);
+ if (disableLoggingToConsole())
+ {
+ Logger logger = Logger.getLogger("org.opends");
+ logger.setUseParentHandlers(false);
+ }
}
/**
@@ -127,4 +123,8 @@
return sb.toString();
}
+ private static boolean disableLoggingToConsole()
+ {
+ return !"true".equals(System.getenv("OPENDS_LOG_TO_STDOUT"));
+ }
}
--
Gitblit v1.10.0