From 0f515a7de68e8a78f11afebd51b8353ac7558447 Mon Sep 17 00:00:00 2001 From: vis2k Date: Fri, 13 May 2022 12:46:57 +0800 Subject: [PATCH] KcpConnection.SendReliable: added OnError instead of logs --- kcp2k/Assets/Tests/Editor/ClientServerTests.cs | 4 ++-- kcp2k/Assets/kcp2k/highlevel/KcpConnection.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kcp2k/Assets/Tests/Editor/ClientServerTests.cs b/kcp2k/Assets/Tests/Editor/ClientServerTests.cs index 5de24043..90865bc8 100644 --- a/kcp2k/Assets/Tests/Editor/ClientServerTests.cs +++ b/kcp2k/Assets/Tests/Editor/ClientServerTests.cs @@ -370,7 +370,7 @@ public void ClientToServerTooLargeReliableMessage() byte[] message = new byte[KcpConnection.ReliableMaxMessageSize(ReceiveWindowSize) + 1]; #if UNITY_2018_3_OR_NEWER - UnityEngine.TestTools.LogAssert.Expect(UnityEngine.LogType.Error, new Regex($".*Failed to send reliable message of size {message.Length} because it's larger than ReliableMaxMessageSize={KcpConnection.ReliableMaxMessageSize(ReceiveWindowSize)}")); + UnityEngine.TestTools.LogAssert.Expect(UnityEngine.LogType.Warning, new Regex($".*Failed to send reliable message of size {message.Length} because it's larger than ReliableMaxMessageSize={KcpConnection.ReliableMaxMessageSize(ReceiveWindowSize)}")); #endif SendClientToServerBlocking(new ArraySegment(message), KcpChannel.Reliable); Assert.That(serverReceived.Count, Is.EqualTo(0)); @@ -660,7 +660,7 @@ public void ServerToClientTooLargeReliableMessage() byte[] message = new byte[KcpConnection.ReliableMaxMessageSize(ReceiveWindowSize) + 1]; #if UNITY_2018_3_OR_NEWER - UnityEngine.TestTools.LogAssert.Expect(UnityEngine.LogType.Error, new Regex($".*Failed to send reliable message of size {message.Length} because it's larger than ReliableMaxMessageSize={KcpConnection.ReliableMaxMessageSize(ReceiveWindowSize)}")); + UnityEngine.TestTools.LogAssert.Expect(UnityEngine.LogType.Warning, new Regex($".*Failed to send reliable message of size {message.Length} because it's larger than ReliableMaxMessageSize={KcpConnection.ReliableMaxMessageSize(ReceiveWindowSize)}")); #endif SendServerToClientBlocking(connectionId, new ArraySegment(message), KcpChannel.Reliable); Assert.That(clientReceived.Count, Is.EqualTo(0)); diff --git a/kcp2k/Assets/kcp2k/highlevel/KcpConnection.cs b/kcp2k/Assets/kcp2k/highlevel/KcpConnection.cs index 42028c64..d8aa5085 100644 --- a/kcp2k/Assets/kcp2k/highlevel/KcpConnection.cs +++ b/kcp2k/Assets/kcp2k/highlevel/KcpConnection.cs @@ -578,12 +578,12 @@ void SendReliable(KcpHeader header, ArraySegment content) if (sent < 0) { // GetType() shows Server/ClientConn instead of just Connection. - Log.Warning($"{GetType()}: Send failed with error={sent} for content with length={content.Count}"); + OnError(ErrorCode.InvalidSend, $"{GetType()}: Send failed with error={sent} for content with length={content.Count}"); } } // otherwise content is larger than MaxMessageSize. let user know! - // GetType() shows Server/ClientConn instead of just Connection. - else Log.Error($"{GetType()}: Failed to send reliable message of size {content.Count} because it's larger than ReliableMaxMessageSize={ReliableMaxMessageSize(kcp.rcv_wnd)}"); + // GetType() shows Server/ClientConn instead of just Connection. + else OnError(ErrorCode.InvalidSend, $"{GetType()}: Failed to send reliable message of size {content.Count} because it's larger than ReliableMaxMessageSize={ReliableMaxMessageSize(kcp.rcv_wnd)}"); } void SendUnreliable(ArraySegment message)