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

Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2019-07-04 14:21:07 +10:00
parent d4217cb20b d8164a1728
commit 6eee5ad415
6 changed files with 165 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-websocket/jetty-websocket-api/src/main/java/org/eclipse/jetty/websocket/api/WebSocketSessionListener.java
View File

@ -23,7 +23,11 @@ package org.eclipse.jetty.websocket.api;
*/
public interface WebSocketSessionListener
{
void onWebSocketSessionOpened(Session session);
default void onWebSocketSessionOpened(Session session)
{
}
void onWebSocketSessionClosed(Session session);
default void onWebSocketSessionClosed(Session session)
{
}
}

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

@ -39,6 +39,7 @@ public class SessionTracker extends AbstractLifeCycle implements WebSocketSessio
@Override
public void onWebSocketSessionOpened(Session session)
{
LifeCycle.start(session);
sessions.add(session);
}
@ -46,6 +47,7 @@ public class SessionTracker extends AbstractLifeCycle implements WebSocketSessio
public void onWebSocketSessionClosed(Session session)
{
sessions.remove(session);
LifeCycle.stop(session);
}
@Override

156
jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/ConcurrentConnectTest.java Normal file
View File

@ -0,0 +1,156 @@
//
// ========================================================================
// Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
// ------------------------------------------------------------------------
// All rights reserved. This program and the accompanying materials
// are made available under the terms of the Eclipse Public License v1.0
// and Apache License v2.0 which accompanies this distribution.
//
// The Eclipse Public License is available at
// http://www.eclipse.org/legal/epl-v10.html
//
// The Apache License v2.0 is available at
// http://www.opensource.org/licenses/apache2.0.php
//
// You may elect to redistribute this code under either of these licenses.
// ========================================================================
//
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;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.api.WebSocketSessionListener;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.common.WebSocketSession;
import org.eclipse.jetty.websocket.server.JettyWebSocketServlet;
import org.eclipse.jetty.websocket.server.JettyWebSocketServletFactory;
import org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConcurrentConnectTest
{
private static final int MAX_CONNECTIONS = 150;
private Server server;
private WebSocketClient client;
private URI uri;
@BeforeEach
public void start() throws Exception
{
server = new Server();
ServerConnector connector = new ServerConnector(server);
connector.setPort(0);
server.addConnector(connector);
ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
JettyWebSocketServlet servlet = new JettyWebSocketServlet() {
@Override
protected void configure(JettyWebSocketServletFactory factory)
{
factory.register(EchoSocket.class);
}
};
context.addServlet(new ServletHolder(servlet), "/");
server.setHandler(context);
JettyWebSocketServletContainerInitializer.configure(context, null);
server.start();
uri = new URI("ws://localhost:" + connector.getLocalPort());
client = new WebSocketClient();
client.getHttpClient().setMaxConnectionsPerDestination(MAX_CONNECTIONS);
client.start();
}
@AfterEach
public void stop() throws Exception
{
client.stop();
server.stop();
}
@Test
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++)
{
try
{
EventSocket wsListener = new EventSocket();
listeners.add(wsListener);
client.connect(wsListener, uri);
}
catch (Exception e)
{
throw new RuntimeException(e);
}
}
for (EventSocket l : listeners)
{
assertTrue(l.openLatch.await(5, TimeUnit.SECONDS));
}
for (EventSocket l : listeners)
{
l.session.getRemote().sendString("ping");
assertThat(l.messageQueue.poll(5, TimeUnit.SECONDS), is("ping"));
l.session.close(StatusCode.NORMAL, "close from client");
}
for (EventSocket l : listeners)
{
assertTrue(l.closeLatch.await(5, TimeUnit.SECONDS));
assertThat(l.statusCode, is(StatusCode.NORMAL));
assertThat(l.reason, is("close from client"));
assertNull(l.error);
}
closeListener.closeLatch.await(5, TimeUnit.SECONDS);
for (EventSocket l : listeners)
{
assertTrue(((WebSocketSession)l.session).isStopped());
}
assertTrue(client.getOpenSessions().isEmpty());
assertTrue(client.getContainedBeans(WebSocketSession.class).isEmpty());
}
public static class CloseListener implements WebSocketSessionListener
{
public CountDownLatch closeLatch = new CountDownLatch(MAX_CONNECTIONS);
@Override
public void onWebSocketSessionClosed(Session session)
{
closeLatch.countDown();
}
}
}

2
jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
View File

@ -344,7 +344,7 @@ public class ClientCloseTest
// clients disconnect
for (int i = 0; i < sessionCount; i++)
{
clientSockets.get(i).assertReceivedCloseEvent(2000, is(StatusCode.ABNORMAL), containsString("Session Closed"));
clientSockets.get(i).assertReceivedCloseEvent(2000, is(StatusCode.SHUTDOWN), containsString("Container being shut down"));
}
// ensure all Sessions are gone. connections are gone. etc. (client and server)

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

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

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

@ -103,11 +103,6 @@ public class ClientSessionsTest
client.addSessionListener(new WebSocketSessionListener()
{
@Override
public void onWebSocketSessionOpened(Session session)
{
}
@Override
public void onWebSocketSessionClosed(Session session)
{