Skip to content

Downgrade expected WebSocket disconnect exceptions from Error to Debug #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nnhy merged 2 commits into from
Jul 20, 2026
Merged

Downgrade expected WebSocket disconnect exceptions from Error to Debug #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2cab6d
Initial plan
Copilot Jul 20, 2026
7f6ae0a
Downgrade WebSocket normal-disconnect exceptions from Error to Debug
Copilot Jul 20, 2026
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
14 changes: 14 additions & 0 deletions NewLife.Remoting/Clients/WsChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,12 @@ private async Task DoPull(WebSocketClient socket, CancellationTokenSource source
catch (ThreadInterruptedException) { break; }
catch (TaskCanceledException) { }
catch (OperationCanceledException) { }
catch (ObjectDisposedException) { break; }
catch (SocketException sex) when (IsNormalDisconnect(sex.SocketErrorCode))
{
_client.Log?.Debug("[{0}]WebSocket连接断开[{1}]", _client.Name, sex.SocketErrorCode);
break;
}
catch (Exception ex)
{
if (source.IsCancellationRequested) break;
Expand Down Expand Up @@ -199,6 +205,14 @@ protected virtual async Task OnReceive(IPacket data, CancellationToken cancellat
await _client.HandleAsync(data, ctx, cancellationToken).ConfigureAwait(false);
}

/// <summary>判断是否为正常断开的SocketError，这类错误降级为Debug日志</summary>
/// <param name="socketError">Socket错误码</param>
/// <returns>是否为正常断开</returns>
protected static Boolean IsNormalDisconnect(SocketError socketError) =>
socketError is SocketError.ConnectionReset // 10054 - 对方重置连接
or SocketError.ConnectionAborted // 10053 - 连接被中止
or SocketError.OperationAborted; // 995 - 操作被中止（本地socket关闭时）

/// <summary>发送文本消息</summary>
/// <param name="data">数据包</param>
/// <param name="cancellationToken">取消令牌</param>
Expand Down
14 changes: 14 additions & 0 deletions NewLife.Remoting/Clients/WsChannelCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#if NETCOREAPP
using System.Net.Sockets;
using System.Net.WebSockets;
using NewLife;
using NewLife.Collections;
Expand Down Expand Up @@ -141,6 +142,19 @@ private async Task DoPull(WebSocket socket, CancellationTokenSource source)
catch (ThreadInterruptedException) { break; }
catch (TaskCanceledException) { }
catch (OperationCanceledException) { }
catch (ObjectDisposedException) { break; }
catch (WebSocketException wex) when (
wex.WebSocketErrorCode == WebSocketError.ConnectionClosedPrematurely ||
socket.State == WebSocketState.Aborted)
Comment on lines +146 to +148
{
_client.Log?.Debug("[{0}]WebSocket连接断开[{1}]", _client.Name, wex.WebSocketErrorCode);
break;
}
catch (SocketException sex) when (IsNormalDisconnect(sex.SocketErrorCode))
{
_client.Log?.Debug("[{0}]WebSocket连接断开[{1}]", _client.Name, sex.SocketErrorCode);
break;
}
catch (Exception ex)
{
if (source.IsCancellationRequested) break;
Expand Down