feat: Added LogLevels and automatic log hooks into UnityEngine

MidLevel · Sep 4, 2019 · d051233 · d051233
1 parent 29f0904
commit d051233
Show file tree

Hide file tree

Showing 11 changed files with 184 additions and 76 deletions.
diff --git a/Ruffles/Channeling/Channels/ReliableChannel.cs b/Ruffles/Channeling/Channels/ReliableChannel.cs
@@ -114,7 +114,7 @@ public HeapMemory[] CreateOutgoingMessage(ArraySegment<byte> payload, out bool d
         {
             if (payload.Count > config.MaxMessageSize)
             {
-                Logging.Error("Tried to send message that was too large. Use a fragmented channel instead. [Size=" + payload.Count + "] [MaxMessageSize=" + config.MaxFragments + "]");
+                if (Logging.CurrentLogLevel <= LogLevel.Error) Logging.LogError("Tried to send message that was too large. Use a fragmented channel instead. [Size=" + payload.Count + "] [MaxMessageSize=" + config.MaxFragments + "]");
                 dealloc = false;
                 return null;
             }

diff --git a/Ruffles/Channeling/Channels/ReliableSequencedChannel.cs b/Ruffles/Channeling/Channels/ReliableSequencedChannel.cs
@@ -154,7 +154,7 @@ public HeapMemory[] CreateOutgoingMessage(ArraySegment<byte> payload, out bool d
         {
             if (payload.Count > config.MaxMessageSize)
             {
-                Logging.Error("Tried to send message that was too large. Use a fragmented channel instead. [Size=" + payload.Count + "] [MaxMessageSize=" + config.MaxFragments + "]");
+                if (Logging.CurrentLogLevel <= LogLevel.Error) Logging.LogError("Tried to send message that was too large. Use a fragmented channel instead. [Size=" + payload.Count + "] [MaxMessageSize=" + config.MaxFragments + "]");
                 dealloc = false;
                 return null;
             }

diff --git a/Ruffles/Channeling/Channels/ReliableSequencedFragmentedChannel.cs b/Ruffles/Channeling/Channels/ReliableSequencedFragmentedChannel.cs
@@ -269,7 +269,7 @@ public HeapMemory HandlePoll()
 
             if (fragment > config.MaxFragments)
             {
-                Logging.Error("FragmentId was too large. [FragmentId=" + fragment + "] [Config.MaxFragments=" + config.MaxFragments + "]. The fragment was silently dropped, expect a timeout.");
+                if (Logging.CurrentLogLevel <= LogLevel.Error) Logging.LogError("FragmentId was too large. [FragmentId=" + fragment + "] [Config.MaxFragments=" + config.MaxFragments + "]. The fragment was silently dropped, expect a timeout.");
                 hasMore = false;
                 return null;
             }
@@ -377,7 +377,7 @@ public HeapMemory[] CreateOutgoingMessage(ArraySegment<byte> payload, out bool d
 
             if (fragmentsRequired > config.MaxFragments)
             {
-                Logging.Error("Tried to create message that was too large. [Size=" + payload.Count + "] [FragmentsRequired=" + fragmentsRequired + "] [Config.MaxFragments=" + config.MaxFragments + "]");
+                if (Logging.CurrentLogLevel <= LogLevel.Error) Logging.LogError("Tried to create message that was too large. [Size=" + payload.Count + "] [FragmentsRequired=" + fragmentsRequired + "] [Config.MaxFragments=" + config.MaxFragments + "]");
                 dealloc = false;
                 return null;
             }

diff --git a/Ruffles/Channeling/Channels/UnreliableChannel.cs b/Ruffles/Channeling/Channels/UnreliableChannel.cs
@@ -37,7 +37,7 @@ public HeapMemory[] CreateOutgoingMessage(ArraySegment<byte> payload, out bool d
         {
             if (payload.Count > config.MaxMessageSize)
             {
-                Logging.Error("Tried to send message that was too large. Use a fragmented channel instead. [Size=" + payload.Count + "] [MaxMessageSize=" + config.MaxFragments + "]");
+                if (Logging.CurrentLogLevel <= LogLevel.Error) Logging.LogError("Tried to send message that was too large. Use a fragmented channel instead. [Size=" + payload.Count + "] [MaxMessageSize=" + config.MaxFragments + "]");
                 dealloc = false;
                 return null;
             }

diff --git a/Ruffles/Channeling/Channels/UnreliableRawChannel.cs b/Ruffles/Channeling/Channels/UnreliableRawChannel.cs
@@ -29,7 +29,7 @@ public HeapMemory[] CreateOutgoingMessage(ArraySegment<byte> payload, out bool d
         {
             if (payload.Count > config.MaxMessageSize)
             {
-                Logging.Error("Tried to send message that was too large. Use a fragmented channel instead. [Size=" + payload.Count + "] [MaxMessageSize=" + config.MaxFragments + "]");
+                if (Logging.CurrentLogLevel <= LogLevel.Error) Logging.LogError("Tried to send message that was too large. Use a fragmented channel instead. [Size=" + payload.Count + "] [MaxMessageSize=" + config.MaxFragments + "]");
                 dealloc = false;
                 return null;
             }

diff --git a/Ruffles/Channeling/Channels/UnreliableSequencedChannel.cs b/Ruffles/Channeling/Channels/UnreliableSequencedChannel.cs
@@ -35,7 +35,7 @@ public HeapMemory[] CreateOutgoingMessage(ArraySegment<byte> payload, out bool d
         {
             if (payload.Count > config.MaxMessageSize)
             {
-                Logging.Error("Tried to send message that was too large. Use a fragmented channel instead. [Size=" + payload.Count + "] [MaxMessageSize=" + config.MaxFragments + "]");
+                if (Logging.CurrentLogLevel <= LogLevel.Error) Logging.LogError("Tried to send message that was too large. Use a fragmented channel instead. [Size=" + payload.Count + "] [MaxMessageSize=" + config.MaxFragments + "]");
                 dealloc = false;
                 return null;
             }

diff --git a/Ruffles/Configuration/SocketConfig.cs b/Ruffles/Configuration/SocketConfig.cs
@@ -7,11 +7,7 @@ namespace Ruffles.Configuration
 {
     public class SocketConfig
     {
-        // Random
-        /// <summary>
-        /// Whether or not to use verbose info logging. This can cause tons of garbage allocation.
-        /// </summary>
-        public bool UseVerboseInfoLogging = false;
+        // General
         /// <summary>
         /// Whether or not to allow polling of the socket. This will require all messages to be processed in a queue.
         /// </summary>