diff src/org/eclipse/jetty/server/bio/SocketConnector.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 6b210bb66c63
line wrap: on
line diff
--- a/src/org/eclipse/jetty/server/bio/SocketConnector.java	Fri Sep 09 17:10:47 2016 -0600
+++ b/src/org/eclipse/jetty/server/bio/SocketConnector.java	Tue Sep 13 23:13:06 2016 -0600
@@ -38,8 +38,8 @@
 import org.eclipse.jetty.server.BlockingHttpConnection;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.util.component.AggregateLifeCycle;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /* ------------------------------------------------------------------------------- */
@@ -56,7 +56,7 @@
  */
 public class SocketConnector extends AbstractConnector
 {
-    private static final Logger LOG = Log.getLogger(SocketConnector.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SocketConnector.class);
 
     protected ServerSocket _serverSocket;
     protected final Set<EndPoint> _connections;
@@ -268,25 +268,25 @@
             {
                 LOG.debug("EOF", e);
                 try{close();}
-                catch(IOException e2){LOG.ignore(e2);}
+                catch(IOException e2){LOG.trace("",e2);}
             }
             catch (SocketException e)
             {
                 LOG.debug("EOF", e);
                 try{close();}
-                catch(IOException e2){LOG.ignore(e2);}
+                catch(IOException e2){LOG.trace("",e2);}
             }
             catch (HttpException e)
             {
                 LOG.debug("BAD", e);
                 try{close();}
-                catch(IOException e2){LOG.ignore(e2);}
+                catch(IOException e2){LOG.trace("",e2);}
             }
             catch(Exception e)
             {
                 LOG.warn("handle failed?",e);
                 try{close();}
-                catch(IOException e2){LOG.ignore(e2);}
+                catch(IOException e2){LOG.trace("",e2);}
             }
             finally
             {
@@ -317,7 +317,7 @@
                 }
                 catch(IOException e)
                 {
-                    LOG.ignore(e);
+                    LOG.trace("",e);
                 }
             }
         }