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

Allow for configuring WebSocketClient JVM lifecycle

Browse Source 
Signed-off-by: Lucas Fairchild-Madar <lfairchildmadar@flightstats.com>
This commit is contained in:
Lucas Fairchild-Madar 2017-08-25 11:23:08 -07:00
parent 2a3deb0a10
commit b680d1deea
1 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
View File

@ -77,6 +77,9 @@ public class WebSocketClient extends ContainerLifeCycle implements WebSocketCont
private final int id = ThreadLocalRandom.current().nextInt(); private final int id = ThreadLocalRandom.current().nextInt();
// defaults to true for backwards compatibility
private boolean stopAtShutdown = true;
/** /**
* Instantiate a WebSocketClient with defaults * Instantiate a WebSocketClient with defaults
*/ */
@ -378,21 +381,37 @@ public class WebSocketClient extends ContainerLifeCycle implements WebSocketCont
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("connect websocket {} to {}",websocket,toUri); LOG.debug("connect websocket {} to {}",websocket,toUri);
init();
WebSocketUpgradeRequest wsReq = new WebSocketUpgradeRequest(this,httpClient,request); WebSocketUpgradeRequest wsReq = new WebSocketUpgradeRequest(this,httpClient,request);
wsReq.setUpgradeListener(upgradeListener); wsReq.setUpgradeListener(upgradeListener);
return wsReq.sendAsync(); return wsReq.sendAsync();
} }
@Override
protected void doStart() throws Exception
{
if (LOG.isDebugEnabled())
LOG.debug("Starting {}",this);
if (isStopAtShutdown()) {
ShutdownThread.register(this);
}
super.doStart();
if (LOG.isDebugEnabled())
LOG.debug("Started {}",this);
}
@Override @Override
protected void doStop() throws Exception protected void doStop() throws Exception
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Stopping {}",this); LOG.debug("Stopping {}",this);
ShutdownThread.deregister(this); if (isStopAtShutdown()) {
ShutdownThread.deregister(this);
}
super.doStop(); super.doStop();
@ -550,14 +569,6 @@ public class WebSocketClient extends ContainerLifeCycle implements WebSocketCont
return httpClient.getSslContextFactory(); return httpClient.getSslContextFactory();
} }
private synchronized void init() throws IOException
{
if (!ShutdownThread.isRegistered(this))
{
ShutdownThread.register(this);
}
}
/** /**
* Factory method for new ConnectionManager * Factory method for new ConnectionManager
* *
@ -694,6 +705,32 @@ public class WebSocketClient extends ContainerLifeCycle implements WebSocketCont
return this.httpClient; return this.httpClient;
} }
/**
* Set JVM shutdown behavior.
* @param stop If true, this client instance will be explicitly stopped when the
* JVM is shutdown. Otherwise the application is responsible for maintaining the WebSocketClient lifecycle.
* @see Runtime#addShutdownHook(Thread)
* @see ShutdownThread
*/
public void setStopAtShutdown(boolean stop)
{
if (stop)
{
if (!stopAtShutdown && isStarted()) {
ShutdownThread.register(this);
}
}
else {
ShutdownThread.deregister(this);
}
stopAtShutdown = stop;
}
public boolean isStopAtShutdown() {
return stopAtShutdown;
}
@Override @Override
public String toString() public String toString()
{ {