lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Redkale
2019-01-18 18:52:47 +08:00
parent d605045858
commit b9d7eaee1b
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/org/redkale/net/http/WebSocketRunner.java
View File

@@ -269,8 +269,8 @@ class WebSocketRunner implements Runnable {
public void failed(Throwable exc, ByteBuffer[] attachments) { public void failed(Throwable exc, ByteBuffer[] attachments) {
future.complete(RETCODE_SENDEXCEPTION); future.complete(RETCODE_SENDEXCEPTION);
closeRunner(RETCODE_SENDEXCEPTION, "websocket send message failed on CompletionHandler"); closeRunner(RETCODE_SENDEXCEPTION, "websocket send message failed on CompletionHandler");
if (exc != null) { if (exc != null && context.getLogger().isLoggable(Level.FINER)) {
context.getLogger().log(Level.FINE, "WebSocket sendMessage on CompletionHandler failed, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", exc); context.getLogger().log(Level.FINER, "WebSocket sendMessage on CompletionHandler failed, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", exc);
} }
} }
@@ -278,7 +278,9 @@ class WebSocketRunner implements Runnable {
} catch (Exception t) { } catch (Exception t) {
futureResult.complete(RETCODE_SENDEXCEPTION); futureResult.complete(RETCODE_SENDEXCEPTION);
closeRunner(RETCODE_SENDEXCEPTION, "websocket send message failed on channel.write"); closeRunner(RETCODE_SENDEXCEPTION, "websocket send message failed on channel.write");
context.getLogger().log(Level.FINE, "WebSocket sendMessage abort, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", t); if (t != null && context.getLogger().isLoggable(Level.FINER)) {
context.getLogger().log(Level.FINER, "WebSocket sendMessage abort, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", t);
}
} }
return futureResult; return futureResult;
@@ -293,24 +295,11 @@ class WebSocketRunner implements Runnable {
synchronized (this) { synchronized (this) {
if (closed) return null; if (closed) return null;
closed = true; closed = true;
channel.dispose();
CompletableFuture<Void> future = engine.removeLocalThenClose(webSocket); CompletableFuture<Void> future = engine.removeLocalThenClose(webSocket);
channel.dispose();
webSocket.onClose(code, reason); webSocket.onClose(code, reason);
return future; return future;
} }
} }
private static final class QueueEntry {
public final CompletableFuture<Integer> future;
public final WebSocketPacket packet;
public QueueEntry(CompletableFuture<Integer> future, WebSocketPacket packet) {
this.future = future;
this.packet = packet;
}
}
} }