diff src/org/eclipse/jetty/server/nio/BlockingChannelConnector.java @ 820:8e9db0bbf4f9

remove org.eclipse.jetty.util.log and upgrade slf4j
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 13 Sep 2016 23:13:06 -0600
parents 3428c60d7cfc
children 0f53601ea489
line wrap: on
line diff
--- a/src/org/eclipse/jetty/server/nio/BlockingChannelConnector.java	Fri Sep 09 17:10:47 2016 -0600
+++ b/src/org/eclipse/jetty/server/nio/BlockingChannelConnector.java	Tue Sep 13 23:13:06 2016 -0600
@@ -37,8 +37,8 @@
 import org.eclipse.jetty.server.BlockingHttpConnection;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.util.ConcurrentHashSet;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /* ------------------------------------------------------------------------------- */
@@ -55,7 +55,7 @@
  */
 public class BlockingChannelConnector extends AbstractNIOConnector
 {
-    private static final Logger LOG = Log.getLogger(BlockingChannelConnector.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BlockingChannelConnector.class);
 
     private transient ServerSocketChannel _acceptChannel;
     private final Set<BlockingChannelEndPoint> _endpoints = new ConcurrentHashSet<BlockingChannelEndPoint>();
@@ -101,11 +101,11 @@
                     }
                     catch(InterruptedException e)
                     {
-                        LOG.ignore(e);
+                        LOG.trace("",e);
                     }
                     catch(Exception e)
                     {
-                        LOG.warn(e);
+                        LOG.warn("",e);
                     }
                 }
             }
@@ -217,7 +217,7 @@
             }
             catch (IOException e)
             {
-                LOG.ignore(e);
+                LOG.trace("",e);
             }
         }
 
@@ -303,19 +303,19 @@
             {
                 LOG.debug("EOF", e);
                 try{BlockingChannelEndPoint.this.close();}
-                catch(IOException e2){LOG.ignore(e2);}
+                catch(IOException e2){LOG.trace("",e2);}
             }
             catch (HttpException e)
             {
                 LOG.debug("BAD", e);
                 try{super.close();}
-                catch(IOException e2){LOG.ignore(e2);}
+                catch(IOException e2){LOG.trace("",e2);}
             }
             catch(Throwable e)
             {
                 LOG.warn("handle failed",e);
                 try{super.close();}
-                catch(IOException e2){LOG.ignore(e2);}
+                catch(IOException e2){LOG.trace("",e2);}
             }
             finally
             {
@@ -343,7 +343,7 @@
                 }
                 catch(IOException e)
                 {
-                    LOG.ignore(e);
+                    LOG.trace("",e);
                 }
             }
         }