Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

469991 - Fix logging levels in websocket client UpgradeConnection 

+ Cleanup of logging levels
This commit is contained in:
Joakim Erdfelt 2015-06-11 12:12:09 -07:00
parent ae3e9ac79a
commit 665fd20995
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
View File

@ -60,6 +60,8 @@ public class UpgradeConnection extends AbstractConnection implements Connection.
{ {
public class SendUpgradeRequest extends FutureCallback implements Runnable public class SendUpgradeRequest extends FutureCallback implements Runnable
{ {
private final Logger LOG = Log.getLogger(UpgradeConnection.SendUpgradeRequest.class);
@Override @Override
public void run() public void run()
{ {
@ -80,8 +82,11 @@ public class UpgradeConnection extends AbstractConnection implements Connection.
@Override @Override
public void succeeded() public void succeeded()
{
if (LOG.isDebugEnabled())
{ {
LOG.debug("Upgrade Request Write Success"); LOG.debug("Upgrade Request Write Success");
}
// Writing the request header is complete. // Writing the request header is complete.
super.succeeded(); super.succeeded();
state = State.RESPONSE; state = State.RESPONSE;
@ -92,7 +97,10 @@ public class UpgradeConnection extends AbstractConnection implements Connection.
@Override @Override
public void failed(Throwable cause) public void failed(Throwable cause)
{ {
LOG.warn("Upgrade Request Write Failure",cause); if (LOG.isDebugEnabled())
{
LOG.debug("Upgrade Request Write Failure",cause);
}
super.failed(cause); super.failed(cause);
state = State.FAILURE; state = State.FAILURE;
// Fail the connect promise when a fundamental exception during connect occurs. // Fail the connect promise when a fundamental exception during connect occurs.
@ -136,12 +144,17 @@ public class UpgradeConnection extends AbstractConnection implements Connection.
// We need to gently close first, to allow // We need to gently close first, to allow
// SSL close alerts to be sent by Jetty // SSL close alerts to be sent by Jetty
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
{
LOG.debug("Shutting down output {}",endPoint); LOG.debug("Shutting down output {}",endPoint);
}
endPoint.shutdownOutput(); endPoint.shutdownOutput();
if (!onlyOutput) if (!onlyOutput)
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
{
LOG.debug("Closing {}",endPoint); LOG.debug("Closing {}",endPoint);
}
endPoint.close(); endPoint.close();
} }
} }
@ -211,7 +224,7 @@ public class UpgradeConnection extends AbstractConnection implements Connection.
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
{ {
LOG.warn("Closed connection {}",this); LOG.debug("Closed connection {}",this);
} }
super.onClose(); super.onClose();
} }
@ -221,7 +234,7 @@ public class UpgradeConnection extends AbstractConnection implements Connection.
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
{ {
LOG.warn("Timeout on connection {}",this); LOG.debug("Timeout on connection {}",this);
} }
failUpgrade(new IOException("Timeout while performing WebSocket Upgrade")); failUpgrade(new IOException("Timeout while performing WebSocket Upgrade"));