warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: Fixes socket disconnect on block. Fixes debug logging (#1031)

Browse source
This commit is contained in:
Kamron Batman 2022-05-21 20:24:46 -07:00 • committed by GitHub
parent 9bbcb4b274
commit ef883b2872
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Projects/Server/Network/NetState/NetState.cs
View file

@ -516,9 +516,6 @@ public partial class NetState : IComparable<NetState>
}
catch (Exception ex)
{
#if DEBUG
Console.WriteLine(ex);
#endif
TraceException(ex);
Disconnect("Exception while sending.");
}
@ -861,18 +858,14 @@ public partial class NetState : IComparable<NetState>
}
catch (SocketException ex)
{
// Socket exceptions are generally ok, just spammy
#if DEBUG
Console.WriteLine(ex);
#endif
Disconnect(string.Empty);
if (ex.SocketErrorCode != SocketError.WouldBlock)
{
logger.Debug(ex, "Disconnected due to socket exception");
Disconnect(string.Empty);
}
}
catch (Exception ex)
{
#if DEBUG
Console.WriteLine(ex);
#endif
Disconnect($"Disconnected with error: {ex}");
TraceException(ex);
}
@ -910,19 +903,15 @@ public partial class NetState : IComparable<NetState>
}
catch (SocketException ex)
{
#if DEBUG
if (ex.ErrorCode != 54 && ex.ErrorCode != 89 && ex.ErrorCode != 995)
{
Console.WriteLine(ex);
}
#endif
if (ex.ErrorCode is not 54 and not 89 and not 995)
{
logger.Debug(ex, "Disconnected due to a socket exception");
}
Disconnect(string.Empty);
}
catch (Exception ex)
{
#if DEBUG
Console.WriteLine(ex);
#endif
Disconnect($"Disconnected with error: {ex}");
TraceException(ex);
}