Spring/spring-integration-extensions
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INTEXT-47 WebSocket PING Polishing

Browse Source 
Use last receive time (instead of last send) because mostly
write sockets (from the server perspective) may still time out.
This commit is contained in:
Gary Russell
2013-02-24 18:01:01 -05:00
parent d1046c9692
commit e068031aba
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-integration-ip-extensions/src/main/java/org/springframework/integration/x/ip/websocket/WebSocketTcpConnectionInterceptorFactory.java
View File

@@ -69,11 +69,12 @@ public class WebSocketTcpConnectionInterceptorFactory extends IntegrationObjectS
@Override
public void run() {
long pingFilter = System.currentTimeMillis() - pingInterval;
// Add 100ms to allow for heuristics
long pingFilter = System.currentTimeMillis() - pingInterval + 100;
for (Entry<TcpConnection, WebSocketTcpConnectionInterceptor> entry : connections.entrySet()) {
TcpConnection connection = entry.getKey();
String connectionId = connection.getConnectionId();
if (entry.getValue().getLastSend() <= pingFilter) {
if (entry.getValue().getLastReceiveTime() <= pingFilter) {
try {
if (logger.isDebugEnabled()) {
logger.debug("Sending Ping to " + connectionId);
@@ -102,6 +103,11 @@ public class WebSocketTcpConnectionInterceptorFactory extends IntegrationObjectS
this.taskScheduler = taskScheduler;
}
/**
* The time between PINGs sent for idle connections. Must be less than half the
* socket timeout (if any).
* @param pingInterval
*/
public void setPingInterval(long pingInterval) {
this.pingInterval = pingInterval;
}
@@ -135,7 +141,7 @@ public class WebSocketTcpConnectionInterceptorFactory extends IntegrationObjectS
private final EventDrivenConsumer resequencer;
private long lastSend;
private long lastReceiveTime;
public WebSocketTcpConnectionInterceptor() {
super();
@@ -156,8 +162,8 @@ public class WebSocketTcpConnectionInterceptorFactory extends IntegrationObjectS
this.resequencer.start();
}
public long getLastSend() {
return lastSend;
public long getLastReceiveTime() {
return lastReceiveTime;
}
/**
@@ -168,6 +174,7 @@ public class WebSocketTcpConnectionInterceptorFactory extends IntegrationObjectS
*/
@Override
public boolean onMessage(Message<?> message) {
this.lastReceiveTime = System.currentTimeMillis();
if (this.getTheConnection() instanceof TcpNioConnection && message.getHeaders().getCorrelationId() != null) {
resequenceChannel.send(message);
return true;
@@ -315,13 +322,6 @@ public class WebSocketTcpConnectionInterceptorFactory extends IntegrationObjectS
super.close();
}
@Override
public void send(Message<?> message) throws Exception {
super.send(message);
this.lastSend = System.currentTimeMillis();
}
private void doHandshake(WebSocketFrame frame, MessageHeaders messageHeaders) throws Exception {
try {
WebSocketFrame handshake = this.getRequiredDeserializer().generateHandshake(frame);

2
spring-integration-ip-extensions/src/test/java/org/springframework/integration/x/ip/websocket/WebSocketServerTests-context.xml
View File

@@ -12,7 +12,7 @@
<int-ip:tcp-connection-factory id="ws"
type="server" port="18080"
using-nio="true"
so-timeout="600000"
so-timeout="60000"
interceptor-factory-chain="interceptors"
serializer="wsSerializer"
deserializer="wsSerializer"