You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by sr...@apache.org on 2009/09/24 22:49:08 UTC
svn commit: r818621 - in /felix/trunk/http: api/ base/ bridge/ bundle/
jetty/ jetty/src/main/java/org/apache/felix/http/jetty/internal/ proxy/
samples/bridge/ samples/filter/ samples/whiteboard/ whiteboard/
Author: srs
Date: Thu Sep 24 20:49:07 2009
New Revision: 818621
URL: http://svn.apache.org/viewvc?rev=818621&view=rev
Log:
FELIX-771: Degraded jetty info logging to debug.
Modified:
felix/trunk/http/api/ (props changed)
felix/trunk/http/base/ (props changed)
felix/trunk/http/bridge/ (props changed)
felix/trunk/http/bundle/ (props changed)
felix/trunk/http/jetty/ (props changed)
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java
felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
felix/trunk/http/proxy/ (props changed)
felix/trunk/http/samples/bridge/ (props changed)
felix/trunk/http/samples/filter/ (props changed)
felix/trunk/http/samples/whiteboard/ (props changed)
felix/trunk/http/whiteboard/ (props changed)
Propchange: felix/trunk/http/api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 24 20:49:07 2009
@@ -0,0 +1 @@
+target
Propchange: felix/trunk/http/base/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 24 20:49:07 2009
@@ -0,0 +1 @@
+target
Propchange: felix/trunk/http/bridge/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 24 20:49:07 2009
@@ -0,0 +1 @@
+target
Propchange: felix/trunk/http/bundle/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 24 20:49:07 2009
@@ -0,0 +1 @@
+target
Propchange: felix/trunk/http/jetty/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 24 20:49:07 2009
@@ -0,0 +1 @@
+target
Modified: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java?rev=818621&r1=818620&r2=818621&view=diff
==============================================================================
--- felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java (original)
+++ felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyLogger.java Thu Sep 24 20:49:07 2009
@@ -57,17 +57,25 @@
public void debug(String msg, Throwable cause)
{
- SystemLogger.debug(msg);
+ if (this.debugEnabled) {
+ SystemLogger.debug(msg);
+ }
}
public void debug(String msg, Object arg0, Object arg1)
{
- SystemLogger.debug(format(msg, arg0, arg1));
+ if (this.debugEnabled) {
+ SystemLogger.debug(format(msg, arg0, arg1));
+ }
}
public void info(String msg, Object arg0, Object arg1)
{
- SystemLogger.info(format(msg, arg0, arg1));
+ // Classify all info messages as debug messages.
+ // Jetty uses way to much verbose info messages.
+ if (this.debugEnabled) {
+ SystemLogger.info(format(msg, arg0, arg1));
+ }
}
public void warn(String msg, Throwable cause)
Modified: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java?rev=818621&r1=818620&r2=818621&view=diff
==============================================================================
--- felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java (original)
+++ felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java Thu Sep 24 20:49:07 2009
@@ -131,6 +131,7 @@
context.addServlet(new ServletHolder(this.dispatcher), "/*");
this.server.start();
+ SystemLogger.info("Started jetty " + Server.getVersion() + " at port " + this.config.getHttpPort());
}
private void initializeHttp()
Propchange: felix/trunk/http/proxy/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 24 20:49:07 2009
@@ -0,0 +1 @@
+target
Propchange: felix/trunk/http/samples/bridge/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 24 20:49:07 2009
@@ -0,0 +1 @@
+target
Propchange: felix/trunk/http/samples/filter/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 24 20:49:07 2009
@@ -0,0 +1 @@
+target
Propchange: felix/trunk/http/samples/whiteboard/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 24 20:49:07 2009
@@ -0,0 +1 @@
+target
Propchange: felix/trunk/http/whiteboard/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 24 20:49:07 2009
@@ -0,0 +1 @@
+target