[Mulgara-svn] r2018 - in trunk/src/jar: server/java/org/mulgara/server util/java/org/mulgara/util

[pag at mulgara.org]

Author: pag
Date: 2011-07-21 18:22:31 +0000 (Thu, 21 Jul 2011)
New Revision: 2018

Modified:
   trunk/src/jar/server/java/org/mulgara/server/HttpServices.java
   trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java
Log:
Properly setting and disabling Jetty logging

Modified: trunk/src/jar/server/java/org/mulgara/server/HttpServices.java
===================================================================
--- trunk/src/jar/server/java/org/mulgara/server/HttpServices.java	2011-07-20 02:33:09 UTC (rev 2017)
+++ trunk/src/jar/server/java/org/mulgara/server/HttpServices.java	2011-07-21 18:22:31 UTC (rev 2018)
@@ -186,7 +186,8 @@
 
     // Set the magic logging property for Jetty to use Log4j
     System.setProperty(JettyLogger.LOGGING_CLASS_PROPERTY, JettyLogger.class.getCanonicalName());
-    JettyLogger.setEnabled(true);
+    JettyLogger.setEnabled(false);
+    org.eclipse.jetty.util.log.Log.setLog(new JettyLogger());
 
     // create and register a new HTTP server
     Server privateServer = buildAndConfigure(config.getJetty().getConnector(), ServerInfo.getHttpPort());

Modified: trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java
===================================================================
--- trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java	2011-07-20 02:33:09 UTC (rev 2017)
+++ trunk/src/jar/util/java/org/mulgara/util/JettyLogger.java	2011-07-21 18:22:31 UTC (rev 2018)
@@ -136,7 +136,7 @@
    * @return <code>true</code> if debug messages are acted on.
    */
   public boolean isDebugEnabled() {
-    return debugEnabled;
+    return enabled && debugEnabled;
   }