From e6353a9de3c4b6bfeeb0c00887f771cad6f7ee71 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 22 Jan 2010 09:56:42 +0000
Subject: [PATCH] Allow to use an environment variable to log control panel messages to standard output.  If the environment variable is not set to 'true' the current behavior is kept.

---
 opends/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java b/opends/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java
index 84e679b..30eb1c3 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/util/ControlPanelLog.java
@@ -22,7 +22,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2008-2009 Sun Microsystems, Inc.
+ *      Copyright 2008-2010 Sun Microsystems, Inc.
  */
 package org.opends.guitools.controlpanel.util;
 
@@ -61,7 +61,10 @@
       for (String packageName : packages)
       {
         Logger logger = Logger.getLogger(packageName);
-        logger.setUseParentHandlers(false); // disable logging to console
+        if (disableLoggingToConsole())
+        {
+          logger.setUseParentHandlers(false); // disable logging to console
+        }
         logger.addHandler(fileHandler);
       }
       Logger logger = Logger.getLogger(packages[0]);
@@ -78,7 +81,10 @@
    */
   static public void initPackage(String packageName) throws IOException {
     Logger logger = Logger.getLogger(packageName);
-    logger.setUseParentHandlers(false); // disable logging to console
+    if (disableLoggingToConsole())
+    {
+      logger.setUseParentHandlers(false); // disable logging to console
+    }
     logger.addHandler(fileHandler);
     logger.log(Level.INFO, getInitialLogRecord());
   }
@@ -108,5 +114,9 @@
     return sb.toString();
   }
 
+  private static boolean disableLoggingToConsole()
+  {
+    return !"true".equals(System.getenv("OPENDS_LOG_TO_STDOUT"));
+  }
 }
 

--
Gitblit v1.10.0