Work on logging.

Dtronix · Sep 15, 2023 · 287f623 · 287f623
1 parent 9098568
commit 287f623
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 18 deletions.
diff --git a/src/NexNet.IntegrationTests/ConsoleLogger.cs b/src/NexNet.IntegrationTests/ConsoleLogger.cs
@@ -12,7 +12,7 @@ public class ConsoleLogger : INexusLogger
     private int _currentLineIndex = 0;
     private int _totalLinesWritten = 0;
 
-    public string? Category { get; }
+    public string? Category { get; set; }
 
     public bool LogEnabled { get; set; } = true;
 

diff --git a/src/NexNet.IntegrationTests/Pipes/NexusServerTests_NexusDuplexPipe.cs b/src/NexNet.IntegrationTests/Pipes/NexusServerTests_NexusDuplexPipe.cs
@@ -53,7 +53,7 @@ public async Task Server_PipeReaderReceivesDataMultipleTimesWithLargeData(Type t
         var count = 0;
         var largeData = new byte[1024 * 32];
         // TODO: Review adding a test for increased iterations as this has been found to sometimes fail on CI.
-        const int iterations = 100000;
+        const int iterations = 1000;
         sNexus.ServerTaskValueWithDuplexPipeEvent = async (nexus, pipe) =>
         {
             var result = await pipe.Input.ReadAsync().Timeout(1);
@@ -71,6 +71,8 @@ public async Task Server_PipeReaderReceivesDataMultipleTimesWithLargeData(Type t
         }
 
         await tcs.Task.Timeout(1);
+
+        Assert.Fail("Test is not complete");
     }
 
     [TestCase(Type.Uds)]

diff --git a/src/NexNet/INexusLogger.cs b/src/NexNet/INexusLogger.cs
@@ -10,7 +10,7 @@ public interface INexusLogger
     /// <summary>
     /// Category for the log event.
     /// </summary>
-    public string? Category { get; }
+    public string? Category { get; set; }
 
     /// <summary>
     /// Level for the log event.

diff --git a/src/NexNet/Internals/NexusSession.cs b/src/NexNet/Internals/NexusSession.cs
@@ -104,7 +104,7 @@ public NexusSession(in NexusSessionConfigurations<TNexus, TProxy> configurations
             ? new ServerSessionContext<TProxy>(this, _sessionManager!)
             : new ClientSessionContext<TProxy>(this);
 
-        Logger = configurations.Configs.Logger?.CreateLogger($"NexusSession [{Id}]");
+        Logger = configurations.Configs.Logger?.CreateLogger($"NexusSession:S{Id}");
 
         PipeManager = _cacheManager.PipeManagerCache.Rent(this);
         PipeManager.Setup(this);

diff --git a/src/NexNet/Pipes/NexusDuplexPipe.cs b/src/NexNet/Pipes/NexusDuplexPipe.cs
@@ -78,12 +78,22 @@ internal enum State : byte
     /// <summary>
     /// True if this pipe is the pipe used for initiating the pipe connection.
     /// </summary>
-    internal bool InitiatingPipe;
+    internal readonly bool InitiatingPipe;
 
     /// <summary>
     /// Complete compiled ID containing the client bit and the server bit.
     /// </summary>
-    public ushort Id { get; set; }
+    public ushort Id
+    {
+        get => _id;
+        set
+        {
+            if(Logger != null)
+                Logger.Category = $"NexusDuplexPipe:S{_session!.Id}:P{value}";
+
+            _id = value;
+        }
+    }
 
     /// <summary>
     /// Initial ID of this side of the connection.
@@ -115,15 +125,27 @@ internal enum State : byte
     /// </summary>
     protected INexusLogger? Logger;
 
+    private ushort _id;
+
     NexusPipeWriter INexusDuplexPipe.WriterCore => _outputPipeWriter;
     NexusPipeReader INexusDuplexPipe.ReaderCore => _inputPipeReader;
 
-    internal NexusDuplexPipe(byte localId, INexusSession session)
+    internal NexusDuplexPipe(ushort fullId, byte localId, INexusSession session)
     {
         _readyTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);
         _session = session;
-        Logger = session.Logger?.CreateLogger<NexusDuplexPipe>();
+
+        if(fullId == 0)
+            Logger = session.Logger?.CreateLogger($"NexusDuplexPipe:S{session.Id}:L{localId:000}");
+        else
+        {
+            Logger = session.Logger?.CreateLogger($"NexusDuplexPipe:S{session.Id}:P{fullId:00000}");
+        }
         LocalId = localId;
+        _id = fullId;
+
+        if(fullId == 0)
+            InitiatingPipe = true;
 
         _inputPipeReader = new NexusPipeReader(
             this,
@@ -222,7 +244,7 @@ public bool UpdateState(State updatedState, bool remove = false)
 
         var isServer = _session.IsServer;
 
-        Logger?.LogTrace($"{Id}: Current State: {currentState}; Update State: {updatedState};");
+        Logger?.LogTrace($"Current State: {currentState}; Update State: {updatedState};");
 
         if (currentState == State.Unset)
         {

diff --git a/src/NexNet/Pipes/NexusPipeManager.cs b/src/NexNet/Pipes/NexusPipeManager.cs
@@ -26,7 +26,7 @@ public void Setup(INexusSession session)
         _usedIds.SetAll(false);
         _isCanceled = false;
         _session = session;
-        _logger = session.Logger?.CreateLogger<NexusPipeManager>();
+        _logger = session.Logger?.CreateLogger($"NexusPipeManager:S{session.Id}");
     }
 
     public IRentedNexusDuplexPipe? RentPipe()
@@ -38,7 +38,6 @@ public void Setup(INexusSession session)
         var partialId = GetPartialIdFromLocalId(localId);
         var pipe = new RentedNexusDuplexPipe(localId, _session)
         {
-            InitiatingPipe = true,
             Manager = this
         };
 
@@ -84,11 +83,7 @@ public async ValueTask<INexusDuplexPipe> RegisterPipe(byte otherId)
 
         var id = GetCompleteId(otherId, out var localId);
 
-        var pipe = new NexusDuplexPipe(localId, _session)
-        {
-            InitiatingPipe = false,
-            Id = id
-        };
+        var pipe = new NexusDuplexPipe(id, localId, _session);
 
         if (!_activePipes.TryAdd(id, pipe))
             throw new Exception("Could not add NexusDuplexPipe to the list of current pipes.");
@@ -174,7 +169,10 @@ public DisconnectReason UpdateState(ushort id, NexusDuplexPipe.State state)
 
                 // Move the pipe to the main active pipes.
                 _activePipes.TryAdd(id, pipe);
+
+                // Set the full ID of the pipe.
                 pipe.Id = id;
+
                 pipe.UpdateState(state);
                 _logger?.LogError($"Readies pipe {id}");
                 return DisconnectReason.None;

diff --git a/src/NexNet/Pipes/RentedNexusDuplexPipe.cs b/src/NexNet/Pipes/RentedNexusDuplexPipe.cs
@@ -7,7 +7,7 @@ namespace NexNet.Pipes;
 internal class RentedNexusDuplexPipe : NexusDuplexPipe, IRentedNexusDuplexPipe
 {
     public RentedNexusDuplexPipe(byte localId, INexusSession session)
-        : base(localId, session)
+        : base(0, localId, session)
     {
     }
 

diff --git a/src/NexNetDemo/SampleLogger.cs b/src/NexNetDemo/SampleLogger.cs
@@ -6,7 +6,7 @@ class SampleLogger : INexusLogger
 {
     private readonly string _prefix;
 
-    public string? Category { get; }
+    public string? Category { get; set; }
 
     public SampleLogger(string prefix, string? category = null)
     {