Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-03 20:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #3835 - ensure WebSocketSessions are always stopped

Browse Source 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2019-07-01 16:17:41 +10:00
parent c94230da40
commit 2383bf4974
11 changed files with 71 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
View File

@ -524,6 +524,11 @@ public class ClientContainer extends ContainerLifeCycle implements WebSocketCont
this.listener = listener;
}
@Override
public void onSessionCreated(WebSocketSession session)
{
}
@Override
public void onSessionOpened(WebSocketSession session)
{

5
jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/SessionTrackingTest.java
View File

@ -96,6 +96,11 @@ public class SessionTrackingTest
CountDownLatch closedLatch = new CountDownLatch(2);
wsServerFactory.addSessionListener(new WebSocketSessionListener()
{
@Override
public void onSessionCreated(WebSocketSession session)
{
}
@Override
public void onSessionOpened(WebSocketSession session)
{

32
jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ConcurrentConnectTest.java
View File

@ -21,6 +21,7 @@ package org.eclipse.jetty.websocket.tests;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.eclipse.jetty.server.Server;
@ -28,6 +29,8 @@ import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.common.WebSocketSession;
import org.eclipse.jetty.websocket.common.WebSocketSessionListener;
import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
import org.junit.jupiter.api.AfterEach;
@ -78,6 +81,8 @@ public class ConcurrentConnectTest
public void testConcurrentConnect() throws Exception
{
List<EventSocket> listeners = new ArrayList();
CloseListener closeListener = new CloseListener();
client.addSessionListener(closeListener);
final int messages = MAX_CONNECTIONS;
for (int i = 0; i < messages; i++)
@ -113,6 +118,33 @@ public class ConcurrentConnectTest
assertThat(l.closeReason, is("close from client"));
//assertNull(l.failure); //TODO: we can get failures after close??
}
closeListener.closeLatch.await(5, TimeUnit.SECONDS);
for (EventSocket l : listeners)
{
assertTrue(((WebSocketSession)l.session).isStopped());
}
}
public static class CloseListener implements WebSocketSessionListener
{
public CountDownLatch closeLatch = new CountDownLatch(MAX_CONNECTIONS);
@Override
public void onSessionCreated(WebSocketSession session)
{
}
@Override
public void onSessionOpened(WebSocketSession session)
{
}
@Override
public void onSessionClosed(WebSocketSession session)
{
closeLatch.countDown();
}
}
public static class MyWebSocketServlet extends WebSocketServlet

5
jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/BadNetworkTest.java
View File

@ -139,6 +139,11 @@ public class BadNetworkTest
WebSocketServerFactory wssf = (WebSocketServerFactory)context.getServletContext().getAttribute(WebSocketServletFactory.class.getName());
wssf.addSessionListener(new WebSocketSessionListener()
{
@Override
public void onSessionCreated(WebSocketSession session)
{
}
@Override
public void onSessionOpened(WebSocketSession session)
{

5
jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientOpenSessionTracker.java
View File

@ -63,6 +63,11 @@ public class ClientOpenSessionTracker implements Connection.Listener, WebSocketS
this.closeConnectionLatch.countDown();
}
@Override
public void onSessionCreated(WebSocketSession session)
{
}
@Override
public void onSessionOpened(WebSocketSession session)
{

7
jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientSessionsTest.java
View File

@ -102,6 +102,11 @@ public class ClientSessionsTest
client.addSessionListener(new WebSocketSessionListener()
{
@Override
public void onSessionCreated(WebSocketSession session)
{
}
@Override
public void onSessionOpened(WebSocketSession session)
{
@ -134,7 +139,7 @@ public class ClientSessionsTest
assertThat("Session.upgradeRequest", sess.getUpgradeRequest(), notNullValue());
assertThat("Session.upgradeResponse", sess.getUpgradeResponse(), notNullValue());
Collection<WebSocketSession> sessions = client.getBeans(WebSocketSession.class);
Collection<WebSocketSession> sessions = client.getOpenSessions();
assertThat("client.connectionManager.sessions.size", sessions.size(), is(1));
RemoteEndpoint remote = sess.getRemote();

1
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketUpgradeRequest.java
View File

@ -634,7 +634,6 @@ public class WebSocketUpgradeRequest extends HttpRequest implements CompleteList
session.addManaged(extensionStack);
session.setFuture(fut);
wsClient.addManaged(session);
if (upgradeListener != null)
{

10
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/SessionTracker.java
View File

@ -34,16 +34,24 @@ public class SessionTracker extends AbstractLifeCycle implements WebSocketSessio
return Collections.unmodifiableSet(sessions);
}
@Override
public void onSessionCreated(WebSocketSession session)
{
LifeCycle.start(session);
sessions.add(session);
}
@Override
public void onSessionOpened(WebSocketSession session)
{
sessions.add(session);
// do nothing
}
@Override
public void onSessionClosed(WebSocketSession session)
{
sessions.remove(session);
LifeCycle.stop(session);
}
@Override

2
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
View File

@ -101,6 +101,8 @@ public class WebSocketSession extends ContainerLifeCycle implements Session, Rem
addBean(this.connection);
addBean(this.websocket);
notifySessionListeners(containerScope, (listener) -> listener.onSessionCreated(this));
}
/**

2
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSessionListener.java
View File

@ -20,6 +20,8 @@ package org.eclipse.jetty.websocket.common;
public interface WebSocketSessionListener
{
void onSessionCreated(WebSocketSession session);
void onSessionOpened(WebSocketSession session);
void onSessionClosed(WebSocketSession session);

1
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
View File

@ -663,7 +663,6 @@ public class WebSocketServerFactory extends ContainerLifeCycle implements WebSoc
// Start Components
session.addManaged(extensionStack);
this.addManaged(session);
if (session.isFailed())
{