Mercurial Hosting > luan

diff src/org/eclipse/jetty/server/handler/ConnectHandler.java @ 820:8e9db0bbf4f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/org/eclipse/jetty/server/handler/ConnectHandler.java	Fri Sep 09 17:10:47 2016 -0600
+++ b/src/org/eclipse/jetty/server/handler/ConnectHandler.java	Tue Sep 13 23:13:06 2016 -0600
@@ -52,8 +52,8 @@
 import org.eclipse.jetty.util.HostMap;
 import org.eclipse.jetty.util.TypeUtil;
 import org.eclipse.jetty.util.component.LifeCycle;
-import org.eclipse.jetty.util.log.Log;
-import org.eclipse.jetty.util.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.eclipse.jetty.util.thread.ThreadPool;
 
 /**
@@ -63,7 +63,7 @@
  */
 public class ConnectHandler extends HandlerWrapper
 {
-    private static final Logger LOG = Log.getLogger(ConnectHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConnectHandler.class);
     private final SelectorManager _selectorManager = new Manager();
     private volatile int _connectTimeout = 5000;
     private volatile int _writeTimeout = 30000;
@@ -199,7 +199,7 @@
             catch(Exception e)
             {
                 LOG.warn("ConnectHandler "+baseRequest.getUri()+" "+ e);
-                LOG.debug(e);
+                LOG.debug("",e);
             }
         }
         else
@@ -394,7 +394,7 @@
             }
             catch (IOException xx)
             {
-                LOG.ignore(xx);
+                LOG.trace("",xx);
             }
             throw x;
         }
@@ -576,7 +576,7 @@
             }
             catch (ClosedChannelException x)
             {
-                LOG.debug(x);
+                LOG.debug("",x);
                 throw x;
             }
             catch (IOException x)
@@ -729,7 +729,7 @@
             }
             catch(Exception e)
             {
-                LOG.debug(e);
+                LOG.debug("",e);
                 close();
             }
         }
@@ -801,7 +801,7 @@
             }
             catch (ClosedChannelException x)
             {
-                LOG.debug(x);
+                LOG.debug("",x);
                 closeServer();
                 throw x;
             }
@@ -899,7 +899,7 @@
             }
             catch(Exception e)
             {
-                LOG.debug(e);
+                LOG.debug("",e);
                 close();
             }
         }