Mercurial Hosting > luan
diff src/org/eclipse/jetty/server/AbstractHttpConnection.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 | 292f2e31ab41 |
line wrap: on
line diff
--- a/src/org/eclipse/jetty/server/AbstractHttpConnection.java Fri Sep 09 17:10:47 2016 -0600 +++ b/src/org/eclipse/jetty/server/AbstractHttpConnection.java Tue Sep 13 23:13:06 2016 -0600 @@ -62,8 +62,8 @@ import org.eclipse.jetty.util.QuotedStringTokenizer; import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.URIUtil; -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; /** @@ -99,7 +99,7 @@ */ public abstract class AbstractHttpConnection extends AbstractConnection { - private static final Logger LOG = Log.getLogger(AbstractHttpConnection.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractHttpConnection.class); private static final int UNKNOWN = -2; private static final ThreadLocal<AbstractHttpConnection> __currentConnection = new ThreadLocal<AbstractHttpConnection>(); @@ -467,7 +467,7 @@ catch (Exception e) { LOG.warn("Failed UTF-8 decode for request path, trying ISO-8859-1"); - LOG.ignore(e); + LOG.trace("",e); path = _uri.getDecodedPath(StringUtil.__ISO_8859_1); } @@ -521,12 +521,12 @@ } catch (ContinuationThrowable e) { - LOG.ignore(e); + LOG.trace("",e); } catch (EofException e) { async_exception=e; - LOG.debug(e); + LOG.debug("",e); error=true; _request.setHandled(true); if (!_response.isCommitted()) @@ -535,13 +535,13 @@ catch (RuntimeIOException e) { async_exception=e; - LOG.debug(e); + LOG.debug("",e); error=true; _request.setHandled(true); } catch (HttpException e) { - LOG.debug(e); + LOG.debug("",e); error=true; _request.setHandled(true); _response.sendError(e.getStatus(), e.getReason()); @@ -663,7 +663,7 @@ catch(RuntimeException e) { LOG.warn("header full: "+e); - LOG.debug(e); + LOG.debug("",e); _response.reset(); _generator.reset(); @@ -823,7 +823,7 @@ } catch (Exception e) { - LOG.debug(e); + LOG.debug("",e); if (e instanceof HttpException) throw (HttpException)e; throw new HttpException(HttpStatus.BAD_REQUEST_400,null,e);