Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-09-30 02:43:08 +0000
committerGreg Wilkins2013-09-30 02:45:16 +0000
commitf07722909f1fc40572f68c636bf40aee08012491 (patch)
tree9638fbaa864cc895ee6fd7e926cb3afe84aa9462
parentcb554948a24bd2ea44ed72cfdc12ec937231eb57 (diff)
downloadorg.eclipse.jetty.project-f07722909f1fc40572f68c636bf40aee08012491.tar.gz
org.eclipse.jetty.project-f07722909f1fc40572f68c636bf40aee08012491.tar.xz
org.eclipse.jetty.project-f07722909f1fc40572f68c636bf40aee08012491.zip
reduced routine exception verbosity
-rw-r--r--jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java5
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java11
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java2
3 files changed, 11 insertions, 7 deletions
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
index f8b1327725..96a4f17519 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
@@ -231,7 +231,10 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
}
catch (Exception x)
{
- LOG.info("Exception while notifying connection " + connection, x);
+ if (isRunning())
+ LOG.warn("Exception while notifying connection " + connection, x);
+ else
+ LOG.debug("Exception while notifying connection {}",connection, x);
}
}
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
index de338c13db..fd07220795 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
@@ -21,6 +21,7 @@ package org.eclipse.jetty.server;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -321,13 +322,13 @@ public class HttpChannel<T> implements HttpParser.RequestHandler<T>, Runnable
// Complete generating the response
_response.closeOutput();
}
- catch(EofException e)
+ catch(EofException|ClosedChannelException e)
{
LOG.debug(e);
}
catch(Exception e)
{
- LOG.warn(e);
+ LOG.warn("complete failed",e);
}
finally
{
@@ -599,7 +600,7 @@ public class HttpChannel<T> implements HttpParser.RequestHandler<T>, Runnable
}
catch (IOException e)
{
- LOG.warn(e);
+ LOG.warn("badMessage",e);
}
finally
{
@@ -719,7 +720,7 @@ public class HttpChannel<T> implements HttpParser.RequestHandler<T>, Runnable
@Override
public void failed(final Throwable x)
{
- if (x instanceof EofException)
+ if (x instanceof EofException || x instanceof ClosedChannelException)
{
LOG.debug(x);
_callback.failed(x);
@@ -727,7 +728,7 @@ public class HttpChannel<T> implements HttpParser.RequestHandler<T>, Runnable
}
else
{
- LOG.warn(x);
+ LOG.warn("commit failed",x);
_transport.send(HttpGenerator.RESPONSE_500_INFO,null,true,new Callback()
{
@Override
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
index bbed8bd2fa..488bab9cbf 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
@@ -286,7 +286,7 @@ public abstract class HttpInput<T> extends ServletInputStream
}
catch (IOException e)
{
- LOG.warn(e);
+ LOG.debug(e);
break loop;
}
}

Back to the top