Skip to content
This repository has been archived by the owner on Jul 12, 2023. It is now read-only.

Allow timeout on handshake handler #12

Merged
merged 4 commits into from
Jul 22, 2019
Merged

Allow timeout on handshake handler #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5a8782
Allow timeout on handshake handler
kc7bfi Jul 6, 2017
551c089
Set thread name in cached executor
Sep 11, 2017
b60bacb
Add timeout to sync
kc7bfi Nov 14, 2017
d021c77
Replace sync() with await()
kc7bfi Nov 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...-jsonrpc-client/src/main/java/org/kurento/jsonrpc/client/JsonRpcClientNettyWebSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,10 @@ protected void initChannel(SocketChannel ch) {
final int maxRetries = 5;
while (channel == null || !channel.isOpen()) {
try {
channel = b.connect(host, port).sync().channel();
handler.handshakeFuture().sync();
ChannelFuture connectFuture = b.connect(host, port);
if (!connectFuture.await(this.connectionTimeout)) throw new WebSocketHandshakeException("Timeout");
channel = connectFuture.channel();
if (!handler.handshakeFuture().await(this.connectionTimeout)) throw new WebSocketHandshakeException("Timeout");
} catch (InterruptedException e) {
// This should never happen
log.warn("{} ERROR connecting WS Netty client, opening channel", label, e);
Expand Down Expand Up @@ -298,7 +300,7 @@ private void closeChannel() {
if (channel != null) {
log.debug("{} Closing client", label);
try {
channel.close().sync();
channel.close().await(this.connectionTimeout);
} catch (Exception e) {
log.debug("{} Could not properly close websocket client. Reason: {}", label, e.getMessage(),
e);
Expand Down
4 changes: 3 additions & 1 deletion ...-jsonrpc-server/src/main/java/org/kurento/jsonrpc/internal/ws/WebSocketServerSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

import org.kurento.commons.PropertiesManager;
import org.kurento.commons.exception.KurentoException;
import org.kurento.commons.ThreadFactoryCreator;
import org.kurento.jsonrpc.JsonRpcException;
import org.kurento.jsonrpc.JsonUtils;
import org.kurento.jsonrpc.TransportException;
Expand Down Expand Up @@ -56,7 +57,8 @@ public class WebSocketServerSession extends ServerSession {

private final PendingRequests pendingRequests = new PendingRequests();

private ExecutorService execService = Executors.newCachedThreadPool();
private ExecutorService execService = Executors.newCachedThreadPool(
ThreadFactoryCreator.create("WebSocketServerSession-async"));

public WebSocketServerSession(String sessionId, Object registerInfo,
SessionsManager sessionsManager, WebSocketSession wsSession) {
Expand Down