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

Merge pull request #3336 from eclipse/jetty-10.0.x-3290-websocket-close 

Jetty 10.0.x #3290 websocket close
This commit is contained in:
Simone Bordet 2019-02-18 10:49:33 +01:00 committed by GitHub
parent 85bc84b122 a4a6bd03e7
commit 83b53f102c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 82 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Connection.java
View File

@ -108,11 +108,11 @@ public class HTTP2Connection extends AbstractConnection implements WriteFlusher.
}
@Override
public void onClose()
public void onClose(Throwable cause)
{
if (LOG.isDebugEnabled())
LOG.debug("HTTP2 Close {} ", this);
super.onClose();
super.onClose(cause);
LifeCycle.stop(strategy);
}

10
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
View File

@ -215,11 +215,15 @@ public abstract class AbstractConnection implements Connection
}
@Override
public void onClose()
public void onClose(Throwable cause)
{
if (LOG.isDebugEnabled())
LOG.debug("onClose {}",this);
{
if (cause==null)
LOG.debug("onClose {}", this);
else
LOG.debug("onClose " + this, cause);
}
for (Listener listener : _listeners)
onClosed(listener);
}

30
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractEndPoint.java
View File

@ -232,13 +232,6 @@ public abstract class AbstractEndPoint extends IdleTimeout implements EndPoint
{
}
protected void onClose(Throwable failure)
{
super.onClose();
_writeFlusher.onFail(failure);
_fillInterest.onFail(failure);
}
@Override
public boolean isOutputShutdown()
{
@ -347,13 +340,28 @@ public abstract class AbstractEndPoint extends IdleTimeout implements EndPoint
}
@Override
public void onClose()
public final void onClose()
{
onClose(null);
}
@Override
public void onClose(Throwable failure)
{
super.onClose();
_writeFlusher.onClose();
_fillInterest.onClose();
if (failure==null)
{
_writeFlusher.onClose();
_fillInterest.onClose();
}
else
{
_writeFlusher.onFail(failure);
_fillInterest.onFail(failure);
}
}
@Override
public void fillInterested(Callback callback)
{
@ -427,7 +435,7 @@ public abstract class AbstractEndPoint extends IdleTimeout implements EndPoint
ByteBuffer prefilled = (old_connection instanceof Connection.UpgradeFrom) ?
((Connection.UpgradeFrom)old_connection).onUpgradeFrom() :
null;
old_connection.onClose();
old_connection.onClose(null);
old_connection.getEndPoint().setConnection(newConnection);
if (LOG.isDebugEnabled())

6
jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
View File

@ -208,16 +208,16 @@ public abstract class ChannelEndPoint extends AbstractEndPoint implements Manage
}
@Override
public void onClose()
public void onClose(Throwable cause)
{
try
{
super.onClose();
super.onClose(cause);
}
finally
{
if (_selector!=null)
_selector.destroyEndPoint(this);
_selector.destroyEndPoint(this, cause);
}
}

3
jetty-io/src/main/java/org/eclipse/jetty/io/Connection.java
View File

@ -56,8 +56,9 @@ public interface Connection extends Closeable
/**
* <p>Callback method invoked when this connection is closed.</p>
* <p>Creators of the connection implementation are responsible for calling this method.</p>
* @param cause The cause of the close or null for a normal close
*/
public void onClose();
public void onClose(Throwable cause);
/**
* @return the {@link EndPoint} associated with this Connection.

16
jetty-io/src/main/java/org/eclipse/jetty/io/EndPoint.java
View File

@ -150,7 +150,16 @@ public interface EndPoint extends Closeable
* Close any backing stream associated with the endpoint
*/
@Override
void close();
default void close()
{
close (null);
}
/**
* Close any backing stream associated with the endpoint, passing a cause
* @param cause the reason for the close or null
*/
void close(Throwable cause);
/**
* Fill the passed buffer with data from this endpoint. The bytes are appended to any
@ -248,15 +257,16 @@ public interface EndPoint extends Closeable
/**
* <p>Callback method invoked when this {@link EndPoint} is opened.</p>
* @see #onClose()
* @see #onClose(Throwable)
*/
void onOpen();
/**
* <p>Callback method invoked when this {@link EndPoint} is close.</p>
* @param cause The reason for the close, or null if a normal close.
* @see #onOpen()
*/
void onClose();
void onClose(Throwable cause);
/** Is the endpoint optimized for DirectBuffer usage
* @return True if direct buffers can be used optimally.

10
jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
View File

@ -270,13 +270,13 @@ public class ManagedSelector extends ContainerLifeCycle implements Dumpable
LOG.debug("Created {}", endPoint);
}
public void destroyEndPoint(final EndPoint endPoint)
public void destroyEndPoint(final EndPoint endPoint, Throwable cause)
{
// Waking up the selector is necessary to clean the
// cancelled-key set and tell the TCP stack that the
// socket is closed (so that senders receive RST).
wakeup();
execute(new DestroyEndPoint(endPoint));
execute(new DestroyEndPoint(endPoint, cause));
}
private int getActionSize()
@ -942,10 +942,12 @@ public class ManagedSelector extends ContainerLifeCycle implements Dumpable
private class DestroyEndPoint implements Runnable, Closeable
{
private final EndPoint endPoint;
private final Throwable cause;
public DestroyEndPoint(EndPoint endPoint)
public DestroyEndPoint(EndPoint endPoint, Throwable cause)
{
this.endPoint = endPoint;
this.cause = cause;
}
@Override
@ -955,7 +957,7 @@ public class ManagedSelector extends ContainerLifeCycle implements Dumpable
LOG.debug("Destroyed {}", endPoint);
Connection connection = endPoint.getConnection();
if (connection != null)
_selectorManager.connectionClosed(connection);
_selectorManager.connectionClosed(connection, cause);
_selectorManager.endPointClosed(endPoint);
}

4
jetty-io/src/main/java/org/eclipse/jetty/io/NetworkTrafficSelectChannelEndPoint.java
View File

@ -94,9 +94,9 @@ public class NetworkTrafficSelectChannelEndPoint extends SocketChannelEndPoint
}
@Override
public void onClose()
public void onClose(Throwable cause)
{
super.onClose();
super.onClose(cause);
if (listeners != null && !listeners.isEmpty())
{
for (NetworkTrafficListener listener : listeners)

5
jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
View File

@ -337,12 +337,13 @@ public abstract class SelectorManager extends ContainerLifeCycle implements Dump
* <p>Callback method invoked when a connection is closed.</p>
*
* @param connection the connection just closed
* @param cause the cause of the close or null for normal close
*/
public void connectionClosed(Connection connection)
public void connectionClosed(Connection connection, Throwable cause)
{
try
{
connection.onClose();
connection.onClose(cause);
}
catch (Throwable x)
{

6
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
View File

@ -284,10 +284,10 @@ public class SslConnection extends AbstractConnection implements Connection.Upgr
}
@Override
public void onClose()
public void onClose(Throwable cause)
{
_decryptedEndPoint.getConnection().onClose();
super.onClose();
_decryptedEndPoint.getConnection().onClose(cause);
super.onClose(cause);
}
@Override

4
jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java
View File

@ -203,9 +203,9 @@ public class SslConnectionTest
}
@Override
public void onClose()
public void onClose(Throwable cause)
{
super.onClose();
super.onClose(cause);
}
@Override

9
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
View File

@ -511,10 +511,13 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http
}
@Override
public void onClose()
public void onClose(Throwable cause)
{
_sendCallback.close();
super.onClose();
if (cause==null)
_sendCallback.close();
else
_sendCallback.failed(cause);
super.onClose(cause);
}
@Override

6
jetty-server/src/main/java/org/eclipse/jetty/server/LocalConnector.java
View File

@ -324,13 +324,13 @@ public class LocalConnector extends AbstractConnector
}
@Override
public void onClose()
public void onClose(Throwable cause)
{
Connection connection = getConnection();
if (connection!=null)
connection.onClose();
connection.onClose(cause);
LocalConnector.this.onEndPointClosed(this);
super.onClose();
super.onClose(cause);
_closed.countDown();
}

8
jetty-server/src/main/java/org/eclipse/jetty/server/ProxyConnectionFactory.java
View File

@ -661,9 +661,9 @@ public class ProxyConnectionFactory extends AbstractConnectionFactory
}
@Override
public void close()
public void close(Throwable cause)
{
_endp.close();
_endp.close(cause);
}
@Override
@ -739,9 +739,9 @@ public class ProxyConnectionFactory extends AbstractConnectionFactory
}
@Override
public void onClose()
public void onClose(Throwable cause)
{
_endp.onClose();
_endp.onClose(cause);
}
@Override

13
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/FrameFlusher.java
View File

@ -41,6 +41,7 @@ public class FrameFlusher extends IteratingCallback
{
public static final Frame FLUSH_FRAME = new Frame(OpCode.BINARY);
private static final Logger LOG = Log.getLogger(FrameFlusher.class);
private static final Throwable CLOSED_CHANNEL = new ClosedChannelException();
private final ByteBufferPool bufferPool;
private final EndPoint endPoint;
@ -95,14 +96,11 @@ public class FrameFlusher extends IteratingCallback
return failure==null;
}
public void onClose(Throwable t)
public void onClose(Throwable cause)
{
if (t == null)
t = new ClosedChannelException();
synchronized (this)
{
closedCause = t;
closedCause = cause == null ? CLOSED_CHANNEL : cause;
}
iterate();
@ -265,10 +263,7 @@ public class FrameFlusher extends IteratingCallback
entry.release();
}
entries.clear();
if (endPoint instanceof AbstractEndPoint)
((AbstractEndPoint)endPoint).close(failure);
else
endPoint.close();
endPoint.close(failure);
}
private void releaseAggregate()

10
jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/internal/WebSocketConnection.java
View File

@ -163,19 +163,15 @@ public class WebSocketConnection extends AbstractConnection implements Connectio
* Not related to WebSocket close handshake.
*/
@Override
public void onClose()
public void onClose(Throwable cause)
{
if (LOG.isDebugEnabled())
LOG.debug("onClose() of physical connection");
Throwable t = new ClosedChannelException();
if (!channel.isClosed())
channel.onEof();
flusher.onClose(t);
super.onClose();
flusher.onClose(cause);
super.onClose(cause);
}