Skip to content

Commit c805d07

Browse files
committed
Small fixes
1 parent e41dc91 commit c805d07

7 files changed

Lines changed: 20 additions & 21 deletions

File tree

com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
using PackageInfo = UnityEditor.PackageManager.PackageInfo;
1212
#endif
1313
using UnityEngine.SceneManagement;
14-
using Debug = UnityEngine.Debug;
1514

1615
namespace Unity.Netcode
1716
{

com.unity.netcode.gameobjects/Runtime/Logging/ContextualLogger.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ internal void RemoveInfo(string key)
9090
[MethodImpl(MethodImplOptions.AggressiveInlining)]
9191
public void CaptureFunctionCall([CallerMemberName] string memberName = "")
9292
{
93-
Log(LogType.Log, new Context(LogLevel.Developer, memberName, true));
93+
Log(LogType.Log, new Context(LogLevel.Developer, memberName, true));
9494
}
9595

9696
[HideInCallstack]
@@ -155,7 +155,8 @@ private string BuildLog(Context context)
155155
m_Builder.Append(k_NetcodeHeader);
156156

157157
if (m_UseCompatibilityMode)
158-
{ ;
158+
{
159+
;
159160
m_Builder.Append(context.Message);
160161
}
161162
else
@@ -174,7 +175,7 @@ private string BuildLog(Context context)
174175
/// <summary>
175176
/// Removes the configured context from the logger when this object is disposed.
176177
/// </summary>
177-
public readonly struct DisposableContext: IDisposable
178+
public readonly struct DisposableContext : IDisposable
178179
{
179180
private readonly ContextualLogger m_Logger;
180181
private readonly string m_ToClear;

com.unity.netcode.gameobjects/Runtime/Logging/LogContext.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Runtime.CompilerServices;
2-
using System.Text;
32
using UnityEngine;
43
using Object = UnityEngine.Object;
54

@@ -69,9 +68,9 @@ public Context AddTag(string msg)
6968
return this;
7069
}
7170

72-
public Context ForGameObject(GameObject prefabObj)
71+
public Context ForGameObject(GameObject obj)
7372
{
74-
RelevantObjectOverride = prefabObj.gameObject;
73+
RelevantObjectOverride = obj;
7574
return this;
7675
}
7776
}

com.unity.netcode.gameobjects/Runtime/Logging/LogContextNetworkManager.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ public readonly void AppendTo(LogBuilder builder)
8787
{
8888
// [Session Owner]
8989
builder.Append(k_SessionOwnerString);
90-
} else if (m_NetworkManager.IsServer)
90+
}
91+
else if (m_NetworkManager.IsServer)
9192
{
9293
// [Server]
9394
builder.Append(k_ServerString);

com.unity.netcode.gameobjects/Runtime/Logging/NetworkLog.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ internal struct LogConfiguration
1616
/// </summary>
1717
public static class NetworkLog
1818
{
19-
private static readonly ContextualLogger k_Log = new(true);
19+
private static readonly ContextualLogger k_Log = new(true);
2020

2121
internal static void SetNetworkManager(NetworkManager networkManager)
2222
{
@@ -38,7 +38,7 @@ internal static void SetNetworkManager(NetworkManager networkManager)
3838
/// </summary>
3939
/// <param name="message">The message to log</param>
4040
[HideInCallstack]
41-
public static void LogInfo(string message, [CallerMemberName] string memberName = "") => k_Log.Info(new Context(LogLevel.Normal, message, memberName));
41+
public static void LogInfo(string message) => k_Log.Info(new Context(LogLevel.Normal, message));
4242
[HideInCallstack]
4343
internal static void LogInfo(Context context) => k_Log.Info(context);
4444

@@ -47,7 +47,7 @@ internal static void SetNetworkManager(NetworkManager networkManager)
4747
/// </summary>
4848
/// <param name="message">The message to log</param>
4949
[HideInCallstack]
50-
public static void LogWarning(string message, [CallerMemberName] string memberName = "") => k_Log.Warning(new Context(LogLevel.Error, message, memberName));
50+
public static void LogWarning(string message) => k_Log.Warning(new Context(LogLevel.Error, message));
5151
[HideInCallstack]
5252
internal static void LogWarning(Context context) => k_Log.Warning(context);
5353

@@ -56,7 +56,7 @@ internal static void SetNetworkManager(NetworkManager networkManager)
5656
/// </summary>
5757
/// <param name="message">The message to log</param>
5858
[HideInCallstack]
59-
public static void LogError(string message, [CallerMemberName] string memberName = "") => k_Log.Error(new Context(LogLevel.Error, message, memberName));
59+
public static void LogError(string message) => k_Log.Error(new Context(LogLevel.Error, message));
6060
[HideInCallstack]
6161
internal static void LogError(Context context) => k_Log.Error(context);
6262

@@ -67,28 +67,28 @@ internal static void SetNetworkManager(NetworkManager networkManager)
6767
/// </summary>
6868
/// <param name="message">The message to log</param>
6969
[HideInCallstack]
70-
public static void LogInfoServer(string message, [CallerMemberName] string memberName = "") => k_Log.InfoServer(new Context(LogLevel.Normal, message, memberName));
70+
public static void LogInfoServer(string message) => k_Log.InfoServer(new Context(LogLevel.Normal, message));
7171

7272
/// <summary>
7373
/// Logs an info log locally and on the session owner if possible.
7474
/// </summary>
7575
/// <param name="message">The message to log</param>
7676
[HideInCallstack]
77-
public static void LogInfoSessionOwner(string message, [CallerMemberName] string memberName = "") => k_Log.InfoServer(new Context(LogLevel.Normal, message, memberName));
77+
public static void LogInfoSessionOwner(string message) => k_Log.InfoServer(new Context(LogLevel.Normal, message));
7878

7979
/// <summary>
8080
/// Logs a warning log locally and on the server if possible.
8181
/// </summary>
8282
/// <param name="message">The message to log</param>
8383
[HideInCallstack]
84-
public static void LogWarningServer(string message, [CallerMemberName] string memberName = "") => k_Log.WarningServer(new Context(LogLevel.Error, message, memberName));
84+
public static void LogWarningServer(string message) => k_Log.WarningServer(new Context(LogLevel.Error, message));
8585

8686
/// <summary>
8787
/// Logs an error log locally and on the server if possible.
8888
/// </summary>
8989
/// <param name="message">The message to log</param>
9090
[HideInCallstack]
91-
public static void LogErrorServer(string message, [CallerMemberName] string memberName = "") => k_Log.ErrorServer(new Context(LogLevel.Error, message, memberName));
91+
public static void LogErrorServer(string message) => k_Log.ErrorServer(new Context(LogLevel.Error, message));
9292

9393
internal static LogType GetMessageLogType(UnityEngine.LogType engineLogType)
9494
{
@@ -114,7 +114,7 @@ internal static void SendLogToAuthority(NetworkManager networkManager, LogType l
114114
}
115115

116116
private const string k_SenderId = "SenderId";
117-
internal static Context ContextWithSenderId([NotNull] NetworkManager networkManager, LogLevel level, ulong senderId, string message)
117+
internal static Context BuildContextForServerMessage([NotNull] NetworkManager networkManager, LogLevel level, ulong senderId, string message)
118118
{
119119
var ctx = new Context(level, message, true).AddInfo(k_SenderId, senderId);
120120
if (TryGetNetworkObjectName(networkManager, message, out var name))

com.unity.netcode.gameobjects/Runtime/Messaging/Messages/ServerLogMessage.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ public void Handle(ref NetworkContext context)
5757
switch (LogType)
5858
{
5959
case NetworkLog.LogType.Info:
60-
networkManager.Log.Info(NetworkLog.ContextWithSenderId(networkManager, LogLevel.Normal, senderId, Message));
60+
networkManager.Log.Info(NetworkLog.BuildContextForServerMessage(networkManager, LogLevel.Normal, senderId, Message));
6161
break;
6262
case NetworkLog.LogType.Warning:
63-
networkManager.Log.Warning(NetworkLog.ContextWithSenderId(networkManager, LogLevel.Error, senderId, Message));
63+
networkManager.Log.Warning(NetworkLog.BuildContextForServerMessage(networkManager, LogLevel.Error, senderId, Message));
6464
break;
6565
case NetworkLog.LogType.Error:
66-
networkManager.Log.Error(NetworkLog.ContextWithSenderId(networkManager, LogLevel.Error, senderId, Message));
66+
networkManager.Log.Error(NetworkLog.BuildContextForServerMessage(networkManager, LogLevel.Error, senderId, Message));
6767
break;
6868
}
6969
}

com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerConfigurationTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using NUnit.Framework;
44
using Unity.Netcode.Editor;
55
using Unity.Netcode.Logging;
6-
using Unity.Netcode.RuntimeTests;
76
using Unity.Netcode.Transports.UTP;
87
using UnityEditor.SceneManagement;
98
using UnityEngine;

0 commit comments

Comments
 (0)