Skip to content

Commit 93baf4a

Browse files
TwoTenPvPTwoTenPvP
committed
Changed LogLevel checking to be done by the log call
1 parent 8b5b92c commit 93baf4a

16 files changed

+168
-182
lines changed

‎MLAPI/Data/NetworkPool.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ internal GameObject SpawnObject(Vector3 position, Quaternion rotation)
3636
go.SetActive(true);
3737
}
3838
}
39-
LogHelper.LogWarning("MLAPI: The pool " + poolId + " has ran out of space", LogLevel.Normal);
39+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("The pool " + poolId + " has ran out of space");
4040
return null;
4141
}
4242
}

‎MLAPI/MonoBehaviours/Core/NetworkedBehaviour.cs

Lines changed: 97 additions & 97 deletions
Large diffs are not rendered by default.

‎MLAPI/MonoBehaviours/Core/NetworkedObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ private void OnValidate()
1717
{
1818
if(string.IsNullOrEmpty(NetworkedPrefabName))
1919
{
20-
LogHelper.LogWarning("MLAPI: The NetworkedObject " + gameObject.name + " does not have a NetworkedPrefabName. It has been set to the gameObject name", LogLevel.Normal);
20+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("The NetworkedObject " + gameObject.name + " does not have a NetworkedPrefabName. It has been set to the gameObject name");
2121
NetworkedPrefabName = gameObject.name;
2222
}
2323
}

‎MLAPI/MonoBehaviours/Core/NetworkingManager.cs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ private void OnValidate()
165165

166166
if(NetworkConfig.EnableSceneSwitching && !NetworkConfig.RegisteredScenes.Contains(SceneManager.GetActiveScene().name))
167167
{
168-
LogHelper.LogWarning("MLAPI: The active scene is not registered as a networked scene. The MLAPI has added it", LogLevel.Normal);
168+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("The active scene is not registered as a networked scene. The MLAPI has added it");
169169
NetworkConfig.RegisteredScenes.Add(SceneManager.GetActiveScene().name);
170170
}
171171

172172
if(!NetworkConfig.EnableSceneSwitching && NetworkConfig.HandleObjectSpawning)
173173
{
174-
LogHelper.LogWarning("MLAPI: Please be aware that Scene objects are NOT supported if SceneManagement is turned on, even if HandleObjectSpawning is turned on", LogLevel.Normal);
174+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Please be aware that Scene objects are NOT supported if SceneManagement is turned on, even if HandleObjectSpawning is turned on");
175175
}
176176

177177
if(NetworkConfig.HandleObjectSpawning)
@@ -180,17 +180,17 @@ private void OnValidate()
180180
{
181181
if (string.IsNullOrEmpty(NetworkConfig.NetworkedPrefabs[i].name))
182182
{
183-
LogHelper.LogWarning("MLAPI: The NetworkedPrefab " + NetworkConfig.NetworkedPrefabs[i].prefab.name + " does not have a NetworkedPrefabName.", LogLevel.Normal);
183+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("The NetworkedPrefab " + NetworkConfig.NetworkedPrefabs[i].prefab.name + " does not have a NetworkedPrefabName.");
184184
}
185185
}
186186
int playerPrefabCount = NetworkConfig.NetworkedPrefabs.Count(x => x.playerPrefab == true);
187187
if (playerPrefabCount == 0)
188188
{
189-
LogHelper.LogWarning("MLAPI: There is no NetworkedPrefab marked as a PlayerPrefab", LogLevel.Normal);
189+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("There is no NetworkedPrefab marked as a PlayerPrefab");
190190
}
191191
else if (playerPrefabCount > 1)
192192
{
193-
LogHelper.LogWarning("MLAPI: Only one networked prefab can be marked as a player prefab", LogLevel.Normal);
193+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Only one networked prefab can be marked as a player prefab");
194194
}
195195
else
196196
NetworkConfig.PlayerPrefabName = NetworkConfig.NetworkedPrefabs.Find(x => x.playerPrefab == true).name;
@@ -264,7 +264,7 @@ private object Init(bool server)
264264
{
265265
if (networkedPrefabName.Contains(NetworkConfig.NetworkedPrefabs[i].name))
266266
{
267-
LogHelper.LogWarning("MLAPI: Duplicate NetworkedPrefabName " + NetworkConfig.NetworkedPrefabs[i].name, LogLevel.Normal);
267+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Duplicate NetworkedPrefabName " + NetworkConfig.NetworkedPrefabs[i].name);
268268
continue;
269269
}
270270
NetworkConfig.NetworkPrefabIds.Add(NetworkConfig.NetworkedPrefabs[i].name, i);
@@ -334,7 +334,7 @@ private object Init(bool server)
334334
{
335335
if (addedEncryptedChannels.Contains(NetworkConfig.Channels[i].Name))
336336
{
337-
LogHelper.LogWarning("MLAPI: Duplicate encrypted channel name " + NetworkConfig.Channels[i].Name, LogLevel.Normal);
337+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Duplicate encrypted channel name " + NetworkConfig.Channels[i].Name);
338338
continue;
339339
}
340340
if (NetworkConfig.Channels[i].Encrypted)
@@ -353,7 +353,7 @@ private object Init(bool server)
353353
{
354354
if (addedPassthroughMessages.Contains(NetworkConfig.MessageTypes[i].Name))
355355
{
356-
LogHelper.LogWarning("MLAPI: Duplicate passthrough message type " + NetworkConfig.MessageTypes[i].Name, LogLevel.Normal);
356+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Duplicate passthrough message type " + NetworkConfig.MessageTypes[i].Name);
357357
continue;
358358
}
359359
if (NetworkConfig.MessageTypes[i].Passthrough)
@@ -370,7 +370,7 @@ private object Init(bool server)
370370
{
371371
if (channelNames.Contains(internalChannels[i].Name))
372372
{
373-
LogHelper.LogWarning("MLAPI: Duplicate channel name: " + NetworkConfig.Channels[i].Name, LogLevel.Normal);
373+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Duplicate channel name: " + NetworkConfig.Channels[i].Name);
374374
continue;
375375
}
376376
int channelId = NetworkConfig.NetworkTransport.AddChannel(internalChannels[i].Type, settings);
@@ -452,7 +452,7 @@ private object Init(bool server)
452452
{
453453
if(channelNames.Contains(NetworkConfig.Channels[i].Name))
454454
{
455-
LogHelper.LogWarning("MLAPI: Duplicate channel name: " + NetworkConfig.Channels[i].Name, LogLevel.Normal);
455+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Duplicate channel name: " + NetworkConfig.Channels[i].Name);
456456
continue;
457457
}
458458
int channelId = NetworkConfig.NetworkTransport.AddChannel(NetworkConfig.Channels[i].Type, settings);
@@ -479,15 +479,15 @@ public void StartServer()
479479
{
480480
if (isServer || isClient)
481481
{
482-
LogHelper.LogWarning("MLAPI: Cannot start server while an instance is already running", LogLevel.Normal);
482+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Cannot start server while an instance is already running");
483483
return;
484484
}
485485

486486
if (NetworkConfig.ConnectionApproval)
487487
{
488488
if (ConnectionApprovalCallback == null)
489489
{
490-
LogHelper.LogWarning("MLAPI: No ConnectionApproval callback defined. Connection approval will timeout", LogLevel.Normal);
490+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("No ConnectionApproval callback defined. Connection approval will timeout");
491491
}
492492
}
493493

@@ -509,7 +509,7 @@ public void StartClient()
509509
{
510510
if (isServer || isClient)
511511
{
512-
LogHelper.LogWarning("MLAPI: Cannot start client while an instance is already running", LogLevel.Normal);
512+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Cannot start client while an instance is already running");
513513
return;
514514
}
515515

@@ -583,15 +583,15 @@ public void StartHost(Vector3? pos = null, Quaternion? rot = null)
583583
{
584584
if (isServer || isClient)
585585
{
586-
LogHelper.LogWarning("MLAPI: Cannot start host while an instance is already running", LogLevel.Normal);
586+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Cannot start host while an instance is already running");
587587
return;
588588
}
589589

590590
if (NetworkConfig.ConnectionApproval)
591591
{
592592
if (ConnectionApprovalCallback == null)
593593
{
594-
LogHelper.LogWarning("MLAPI: No ConnectionApproval callback defined. Connection approval will timeout", LogLevel.Normal);
594+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("No ConnectionApproval callback defined. Connection approval will timeout");
595595
}
596596
}
597597
object settings = Init(true);
@@ -620,7 +620,7 @@ private void OnEnable()
620620
{
621621
if (singleton != null)
622622
{
623-
LogHelper.LogWarning("MLAPI: Multiple NetworkingManagers", LogLevel.Normal);
623+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Multiple NetworkingManagers");
624624
Destroy(this);
625625
return;
626626
}
@@ -792,7 +792,7 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId)
792792
//Client tried to send a network message that was not the connection request before he was accepted.
793793
if (isServer && pendingClients.Contains(clientId) && messageType != 0)
794794
{
795-
LogHelper.LogWarning("MLAPI: Message recieved from clientId " + clientId + " before it has been accepted", LogLevel.Normal);
795+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Message recieved from clientId " + clientId + " before it has been accepted");
796796
return;
797797
}
798798

@@ -811,21 +811,21 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId)
811811
{
812812
if (isServer && isPassthrough && !NetworkConfig.PassthroughMessageHashSet.Contains(messageType))
813813
{
814-
LogHelper.LogWarning("MLAPI: Client " + clientId + " tried to send a passthrough message for a messageType not registered as passthrough", LogLevel.Normal);
814+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Client " + clientId + " tried to send a passthrough message for a messageType not registered as passthrough");
815815
messageReader.Dispose();
816816
return;
817817
}
818818
else if (isClient && isPassthrough && !NetworkConfig.PassthroughMessageHashSet.Contains(messageType))
819819
{
820-
LogHelper.LogWarning("MLAPI: Server tried to send a passthrough message for a messageType not registered as passthrough", LogLevel.Normal);
820+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Server tried to send a passthrough message for a messageType not registered as passthrough");
821821
messageReader.Dispose();
822822
return;
823823
}
824824
else if (isServer && isPassthrough)
825825
{
826826
if (!connectedClients.ContainsKey(passthroughTarget))
827827
{
828-
LogHelper.LogWarning("MLAPI: Passthrough message was sent with invalid target: " + passthroughTarget + " from client " + clientId, LogLevel.Normal);
828+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("Passthrough message was sent with invalid target: " + passthroughTarget + " from client " + clientId);
829829
messageReader.Dispose();
830830
return;
831831
}
@@ -848,19 +848,19 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId)
848848
{
849849
if (!SpawnManager.spawnedObjects.ContainsKey(targetNetworkId))
850850
{
851-
LogHelper.LogWarning("MLAPI: No target for message found", LogLevel.Normal);
851+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("No target for message found");
852852
messageReader.Dispose();
853853
return;
854854
}
855855
else if (!SpawnManager.spawnedObjects[targetNetworkId].targetMessageActions.ContainsKey(networkOrderId))
856856
{
857-
LogHelper.LogWarning("MLAPI: No target messageType for message found", LogLevel.Normal);
857+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("No target messageType for message found");
858858
messageReader.Dispose();
859859
return;
860860
}
861861
else if (!SpawnManager.spawnedObjects[targetNetworkId].targetMessageActions[networkOrderId].ContainsKey(messageType))
862862
{
863-
LogHelper.LogWarning("MLAPI: No target found with the given messageType", LogLevel.Normal);
863+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("No target found with the given messageType");
864864
messageReader.Dispose();
865865
return;
866866
}

‎MLAPI/MonoBehaviours/Prototyping/NetworkedAnimator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public override void NetworkStart()
107107
/// </summary>
108108
public void ResetParameterOptions()
109109
{
110-
LogHelper.LogInfo("ResetParameterOptions", LogLevel.Normal);
110+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogInfo("ResetParameterOptions");
111111
parameterSendBits = 0;
112112
animatorParameters = null;
113113
}

‎MLAPI/NetworkingManagerComponents/Binary/BinarySerializer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static byte[] Serialize<T>(T instance)
4747
FieldType fieldType = FieldTypeHelper.GetFieldType(sortedFields[i].FieldType);
4848
if (fieldType == FieldType.Invalid)
4949
{
50-
LogHelper.LogWarning("MLAPI: The field " + sortedFields[i].Name + " will not be serialized as it's not of a supported type. Add the BinaryIgnore attribute to prevent this message from shwoing up.", LogLevel.Normal);
50+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("The field " + sortedFields[i].Name + " will not be serialized as it's not of a supported type. Add the BinaryIgnore attribute to prevent this message from shwoing up.");
5151
continue;
5252
}
5353
FieldTypeHelper.WriteFieldType(writer, sortedFields[i].GetValue(instance), fieldType);
@@ -83,7 +83,7 @@ public static byte[] Serialize<T>(T instance)
8383
FieldType fieldType = FieldTypeHelper.GetFieldType(sortedFields[i].FieldType);
8484
if (fieldType == FieldType.Invalid)
8585
{
86-
LogHelper.LogWarning("MLAPI: The field " + sortedFields[i].Name + " will not be deserialized as it's not of a supported type. Add the BinaryIgnore attribute to prevent this message from shwoing up.", LogLevel.Normal);
86+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("The field " + sortedFields[i].Name + " will not be deserialized as it's not of a supported type. Add the BinaryIgnore attribute to prevent this message from shwoing up.");
8787
continue;
8888
}
8989
sortedFields[i].SetValue(instance, FieldTypeHelper.ReadFieldType(reader, fieldType));
@@ -117,7 +117,7 @@ public static byte[] Serialize<T>(T instance)
117117
FieldType fieldType = FieldTypeHelper.GetFieldType(sortedFields[i].FieldType);
118118
if (fieldType == FieldType.Invalid)
119119
{
120-
LogHelper.LogWarning("MLAPI: The field " + sortedFields[i].Name + " will not be deserialized as it's not of a supported type. Add the BinaryIgnore attribute to prevent this message from shwoing up.", LogLevel.Normal);
120+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("The field " + sortedFields[i].Name + " will not be deserialized as it's not of a supported type. Add the BinaryIgnore attribute to prevent this message from shwoing up.");
121121
continue;
122122
}
123123
sortedFields[i].SetValue(instance, FieldTypeHelper.ReadFieldType(reader, fieldType));

‎MLAPI/NetworkingManagerComponents/Binary/BitReader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static BitReader Get(byte[] readFrom)
3131
if (readerPool.Count == 0)
3232
{
3333
if (pools > 10)
34-
LogHelper.LogWarning("MLAPI: There are more than 10 BitReaders. Have you forgotten do dispose? (More readers hurt performance)", LogLevel.Normal);
34+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("There are more than 10 BitReaders. Have you forgotten do dispose? (More readers hurt performance)");
3535
BitReader reader = new BitReader(readFrom);
3636
pools++;
3737
return reader;

‎MLAPI/NetworkingManagerComponents/Binary/BitWriter.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public static BitWriter Get()
8686
{
8787
if (writerPool.Count == 0)
8888
{
89-
LogHelper.LogWarning("MLAPI: There are more than 10 BitWriters. Have you forgotten do dispose? (It will still work with worse performance)", LogLevel.Normal);
89+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("There are more than 10 BitWriters. Have you forgotten do dispose? (It will still work with worse performance)");
9090
return new BitWriter() { outsidePool = true };
9191
}
9292
else
@@ -99,7 +99,7 @@ private void Push<T>(T b)
9999
else if (b is string || b.GetType().IsArray || IsSupportedType(b.GetType()))
100100
collect.Add(b is string ? Encoding.UTF8.GetBytes(b as string) : b as object);
101101
else
102-
LogHelper.LogWarning("MLAPI: The type \"" + b.GetType() + "\" is not supported by the Binary Serializer. It will be ignored", LogLevel.Normal);
102+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("The type \"" + b.GetType() + "\" is not supported by the Binary Serializer. It will be ignored");
103103
}
104104

105105

@@ -194,15 +194,15 @@ public long Finalize(ref byte[] buffer)
194194
{
195195
if(buffer == null)
196196
{
197-
LogHelper.LogWarning("MLAPI: no buffer provided", LogLevel.Normal);
197+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("no buffer provided");
198198
return 0;
199199
}
200200
long bitCount = 0;
201201
for (int i = 0; i < collect.Count; ++i) bitCount += collect[i] == null ? (8 - (bitCount % 8)) % 8 : GetBitCount(collect[i]);
202202

203203
if (buffer.Length < ((bitCount / 8) + (bitCount % 8 == 0 ? 0 : 1)))
204204
{
205-
LogHelper.LogWarning("MLAPI: The buffer size is not large enough", LogLevel.Normal);
205+
if (LogHelper.CurrentLogLevel <= LogLevel.Normal) LogHelper.LogWarning("The buffer size is not large enough");
206206
return 0;
207207
}
208208
long bitOffset = 0;

0 commit comments

Comments
 (0)