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

454934 - WebSocketClient / connectToServer can block indefinitely during upgrade failure 

+ Handling EOF and Timeout in a clearer way inside UpgradeConnection
This commit is contained in:
Joakim Erdfelt 2015-03-18 16:20:50 -07:00
parent a9be633816
commit e21d24b035
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@
package org.eclipse.jetty.websocket.client.io; package org.eclipse.jetty.websocket.client.io;
import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
@ -128,6 +129,12 @@ public class UpgradeConnection extends AbstractConnection
} }
} }
private void failUpgrade(Throwable cause)
{
close();
connectPromise.failed(cause);
}
private void notifyConnect(ClientUpgradeResponse response) private void notifyConnect(ClientUpgradeResponse response)
{ {
connectPromise.setResponse(response); connectPromise.setResponse(response);
@ -142,6 +149,10 @@ public class UpgradeConnection extends AbstractConnection
@Override @Override
public void onFillable() public void onFillable()
{ {
if (LOG.isDebugEnabled())
{
LOG.debug("onFillable");
}
ByteBuffer buffer = bufferPool.acquire(getInputBufferSize(),false); ByteBuffer buffer = bufferPool.acquire(getInputBufferSize(),false);
BufferUtil.clear(buffer); BufferUtil.clear(buffer);
boolean readMore = false; boolean readMore = false;
@ -164,10 +175,32 @@ public class UpgradeConnection extends AbstractConnection
public void onOpen() public void onOpen()
{ {
super.onOpen(); super.onOpen();
// TODO: handle timeout?
getExecutor().execute(new SendUpgradeRequest()); getExecutor().execute(new SendUpgradeRequest());
} }
@Override
public void onClose()
{
if (LOG.isDebugEnabled())
{
LOG.warn("Closed connection {}",this);
}
super.onClose();
}
@Override
protected boolean onReadTimeout()
{
if (LOG.isDebugEnabled())
{
LOG.warn("Timeout on connection {}",this);
}
failUpgrade(new IOException("Timeout while performing WebSocket Upgrade"));
return super.onReadTimeout();
}
/** /**
* Read / Parse the waiting read/fill buffer * Read / Parse the waiting read/fill buffer
* *
@ -189,7 +222,8 @@ public class UpgradeConnection extends AbstractConnection
} }
else if (filled < 0) else if (filled < 0)
{ {
LOG.debug("read - EOF Reached"); LOG.warn("read - EOF Reached");
failUpgrade(new EOFException("Reading WebSocket Upgrade response"));
return false; return false;
} }
else else

1
jetty-websocket/websocket-client/src/test/resources/jetty-logging.properties
View File

@ -1,6 +1,7 @@
org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog
org.eclipse.jetty.LEVEL=WARN org.eclipse.jetty.LEVEL=WARN
# org.eclipse.jetty.LEVEL=DEBUG # org.eclipse.jetty.LEVEL=DEBUG
# org.eclipse.jetty.io.LEVEL=DEBUG
# org.eclipse.jetty.io.ChannelEndPoint.LEVEL=DEBUG # org.eclipse.jetty.io.ChannelEndPoint.LEVEL=DEBUG
# org.eclipse.jetty.io.SelectChannelEndPoint.LEVEL=DEBUG # org.eclipse.jetty.io.SelectChannelEndPoint.LEVEL=DEBUG
# org.eclipse.jetty.io.IdleTimeout.LEVEL=DEBUG # org.eclipse.jetty.io.IdleTimeout.LEVEL=DEBUG