Mercurial Hosting > luan
diff src/org/eclipse/jetty/io/nio/SelectorManager.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/io/nio/SelectorManager.java Fri Sep 09 17:10:47 2016 -0600 +++ b/src/org/eclipse/jetty/io/nio/SelectorManager.java Tue Sep 13 23:13:06 2016 -0600 @@ -44,8 +44,8 @@ import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.util.component.AggregateLifeCycle; import org.eclipse.jetty.util.component.Dumpable; -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.Timeout; import org.eclipse.jetty.util.thread.Timeout.Task; @@ -58,7 +58,7 @@ */ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpable { - public static final Logger LOG=Log.getLogger("org.eclipse.jetty.io.nio"); + public static final Logger LOG=LoggerFactory.getLogger("org.eclipse.jetty.io.nio"); private static final int __MONITOR_PERIOD=Integer.getInteger("org.eclipse.jetty.io.nio.MONITOR_PERIOD",1000).intValue(); private static final int __MAX_SELECTS=Integer.getInteger("org.eclipse.jetty.io.nio.MAX_SELECTS",100000).intValue(); @@ -291,11 +291,11 @@ } catch(IOException e) { - LOG.ignore(e); + LOG.trace("",e); } catch(Exception e) { - LOG.warn(e); + LOG.warn("",e); } } } @@ -366,7 +366,7 @@ protected void connectionFailed(SocketChannel channel,Throwable ex,Object attachment) { LOG.warn(ex+","+channel+","+attachment); - LOG.debug(ex); + LOG.debug("",ex); } /* ------------------------------------------------------------ */ @@ -510,14 +510,14 @@ } catch (CancelledKeyException e) { - LOG.ignore(e); + LOG.trace("",e); } catch (Throwable e) { if (isRunning()) - LOG.warn(e); + LOG.warn("",e); else - LOG.debug(e); + LOG.debug("",e); try { @@ -526,7 +526,7 @@ } catch(IOException e2) { - LOG.debug(e2); + LOG.debug("",e2); } } } @@ -549,7 +549,7 @@ } catch(InterruptedException e) { - LOG.ignore(e); + LOG.trace("",e); } now=System.currentTimeMillis(); } @@ -660,14 +660,14 @@ } catch (CancelledKeyException e) { - LOG.ignore(e); + LOG.trace("",e); } catch (Exception e) { if (isRunning()) - LOG.warn(e); + LOG.warn("",e); else - LOG.ignore(e); + LOG.trace("",e); try { @@ -676,7 +676,7 @@ } catch(IOException e2) { - LOG.debug(e2); + LOG.debug("",e2); } if (key != null && !(key.channel() instanceof ServerSocketChannel) && key.isValid()) @@ -732,13 +732,13 @@ catch (ClosedSelectorException e) { if (isRunning()) - LOG.warn(e); + LOG.warn("",e); else - LOG.ignore(e); + LOG.trace("",e); } catch (CancelledKeyException e) { - LOG.ignore(e); + LOG.trace("",e); } finally { @@ -875,7 +875,7 @@ } catch(Exception e) { - LOG.ignore(e); + LOG.trace("",e); } // close endpoints and selector @@ -896,7 +896,7 @@ } catch(IOException e) { - LOG.ignore(e); + LOG.trace("",e); } } } @@ -911,7 +911,7 @@ } catch (IOException e) { - LOG.ignore(e); + LOG.trace("",e); } _selector=null; } @@ -965,7 +965,7 @@ } catch(InterruptedException e) { - LOG.ignore(e); + LOG.trace("",e); } AggregateLifeCycle.dump(out,indent,dump);