Mercurial Hosting > luan
diff src/org/eclipse/jetty/server/handler/ContextHandler.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 | 0048a843297a |
line wrap: on
line diff
--- a/src/org/eclipse/jetty/server/handler/ContextHandler.java Fri Sep 09 17:10:47 2016 -0600 +++ b/src/org/eclipse/jetty/server/handler/ContextHandler.java Tue Sep 13 23:13:06 2016 -0600 @@ -79,8 +79,8 @@ import org.eclipse.jetty.util.URIUtil; 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.resource.Resource; /* ------------------------------------------------------------ */ @@ -100,7 +100,7 @@ */ public class ContextHandler extends ScopedHandler implements Attributes, Server.Graceful { - private static final Logger LOG = Log.getLogger(ContextHandler.class); + private static final Logger LOG = LoggerFactory.getLogger(ContextHandler.class); private static final ThreadLocal<Context> __context = new ThreadLocal<Context>(); @@ -475,7 +475,7 @@ } catch (IOException e) { - LOG.debug(e); + LOG.debug("",e); } } if (classpath.length() == 0) @@ -692,7 +692,7 @@ if (_contextPath == null) throw new IllegalStateException("Null contextPath"); - _logger = Log.getLogger(getDisplayName() == null?getContextPath():getDisplayName()); + _logger = LoggerFactory.getLogger(getDisplayName() == null?getContextPath():getDisplayName()); ClassLoader old_classloader = null; Thread current_thread = null; Context old_context = null; @@ -1090,7 +1090,7 @@ } catch (HttpException e) { - LOG.debug(e); + LOG.debug("",e); baseRequest.setHandled(true); response.sendError(e.getStatus(),e.getReason()); } @@ -1349,7 +1349,7 @@ catch (Exception e) { LOG.warn(e.toString()); - LOG.debug(e); + LOG.debug("",e); throw new IllegalArgumentException(resourceBase); } } @@ -1586,7 +1586,7 @@ } catch (Exception e) { - LOG.ignore(e); + LOG.trace("",e); } return null; @@ -1668,7 +1668,7 @@ } catch (Exception e) { - LOG.ignore(e); + LOG.trace("",e); } return Collections.emptySet(); } @@ -1896,7 +1896,7 @@ } catch (Exception e) { - LOG.ignore(e); + LOG.trace("",e); } return null; } @@ -1927,7 +1927,7 @@ } catch (Exception e) { - LOG.ignore(e); + LOG.trace("",e); } return null; @@ -1960,7 +1960,7 @@ } catch (Exception e) { - LOG.ignore(e); + LOG.trace("",e); return null; } }