Mercurial Hosting > luan
diff src/org/eclipse/jetty/server/ssl/SslSocketConnector.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 |
line wrap: on
line diff
--- a/src/org/eclipse/jetty/server/ssl/SslSocketConnector.java Fri Sep 09 17:10:47 2016 -0600 +++ b/src/org/eclipse/jetty/server/ssl/SslSocketConnector.java Tue Sep 13 23:13:06 2016 -0600 @@ -36,8 +36,8 @@ import org.eclipse.jetty.io.bio.SocketEndPoint; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.bio.SocketConnector; -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.ssl.SslContextFactory; /* ------------------------------------------------------------ */ @@ -57,7 +57,7 @@ */ public class SslSocketConnector extends SocketConnector implements SslConnector { - private static final Logger LOG = Log.getLogger(SslSocketConnector.class); + private static final Logger LOG = LoggerFactory.getLogger(SslSocketConnector.class); private final SslContextFactory _sslContextFactory; private int _handshakeTimeout = 0; //0 means use maxIdleTime @@ -655,7 +655,7 @@ if (!_sslContextFactory.isAllowRenegotiate()) { LOG.warn("SSL renegotiate denied: "+ssl); - try{ssl.close();}catch(IOException e){LOG.warn(e);} + try{ssl.close();}catch(IOException e){LOG.warn("",e);} } } else @@ -671,15 +671,15 @@ } catch (SSLException e) { - LOG.debug(e); + LOG.debug("",e); try{close();} - catch(IOException e2){LOG.ignore(e2);} + catch(IOException e2){LOG.trace("",e2);} } catch (IOException e) { - LOG.debug(e); + LOG.debug("",e); try{close();} - catch(IOException e2){LOG.ignore(e2);} + catch(IOException e2){LOG.trace("",e2);} } } }