EonaCat/EonaCat.LogStack
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated

Browse Source
This commit is contained in:
EonaCat
2026-08-04 15:57:32 +02:00
committed by Jeroen Saey
parent 82fac06d8f
commit 3e22c31460
3 changed files with 67 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EonaCat.LogStack/EonaCat.LogStack.csproj
+3 -3
View File
@@ -14,7 +14,7 @@ It features a rich fluent API for routing log events to dozens of destinations f
<Copyright>EonaCat (Jeroen Saey)</Copyright>
<PackageTags>EonaCat;Logger;EonaCatLogStack;Log;Writer;Flows;LogStack;Memory;Speed;Jeroen;Saey</PackageTags>
<PackageIconUrl />
<FileVersion>0.1.9</FileVersion>
<FileVersion>0.2.0</FileVersion>
<PackageReadmeFile>README.md</PackageReadmeFile>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -25,7 +25,7 @@ It features a rich fluent API for routing log events to dozens of destinations f
</PropertyGroup>
<PropertyGroup>
<EVRevisionFormat>0.1.9+{chash:10}.{c:ymd}</EVRevisionFormat>
<EVRevisionFormat>0.2.0+{chash:10}.{c:ymd}</EVRevisionFormat>
<EVDefault>true</EVDefault>
<EVInfo>true</EVInfo>
<EVTagMatch>v[0-9]*</EVTagMatch>
@@ -36,7 +36,7 @@ It features a rich fluent API for routing log events to dozens of destinations f
</PropertyGroup>
<PropertyGroup>
<Version>0.1.9</Version>
<Version>0.2.0</Version>
<PackageId>EonaCat.LogStack</PackageId>
<Product>EonaCat.LogStack</Product>
<RepositoryUrl>https://git.saey.me/EonaCat/EonaCat.LogStack</RepositoryUrl>
EonaCat.LogStack/EonaCatLogger.cs
+59 -20
View File
@@ -718,20 +718,17 @@ namespace EonaCat.LogStack
// Drain and stop the async channel pipeline if active
if (_asyncChannel != null)
{
// Flush all logs from flows first to ensure they're written to disk
await FlushAsync().ConfigureAwait(false);
// Complete the channel - no more writes allowed
// Complete the channel immediately - no more writes allowed
_asyncChannel.Writer.TryComplete();
if (_asyncConsumer != null)
{
try
{
// Wait for the consumer task to finish draining the channel
// Use a generous timeout (30 seconds) since we're dealing with legitimate I/O
// but prevent infinite hangs if something is truly deadlocked
using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
// Give the consumer a very short window (1 second) to finish naturally
// If it doesn't complete in time, we proceed anyway to not block app shutdown
// This is critical for ensuring the logger never blocks application exit
using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(1)))
{
try
{
@@ -739,33 +736,75 @@ namespace EonaCat.LogStack
}
catch (OperationCanceledException)
{
// Do nothing
// Timeout expired - consumer didn't finish in time
// This is acceptable; the background task will continue draining
// but we don't wait for it to allow app exit
}
}
}
catch (Exception ex)
{
// Do nothing
// Ignore any errors during consumer shutdown
}
}
// Attempt to flush flows with a very short timeout
// Don't await indefinitely - prioritize app exit over log flushing
try
{
using (var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(500)))
{
await FlushAsync(cts.Token).ConfigureAwait(false);
}
}
catch (OperationCanceledException)
{
// Flush timed out - that's OK, some logs might be lost but app exits cleanly
}
catch (Exception ex)
{
// Ignore flush errors
}
// Dispose flows with a short timeout
var disposeTasks = _concurrentFlows.Select(f => f.DisposeAsync().AsTask()).ToArray();
if (disposeTasks.Length > 0)
{
try
{
using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(1)))
{
await Task.WhenAll(disposeTasks).ConfigureAwait(false);
}
}
catch (OperationCanceledException)
{
// Disposal timed out - proceed anyway
}
catch (Exception ex)
{
// Ignore disposal errors
}
}
}
else
{
// If using synchronous mode, just flush
await FlushAsync().ConfigureAwait(false);
}
// Dispose flows - they should already be flushed above
var disposeTasks = _concurrentFlows.Select(f => f.DisposeAsync().AsTask()).ToArray();
// If using synchronous mode, attempt a quick flush but don't block
try
{
await Task.WhenAll(disposeTasks).ConfigureAwait(false);
}
catch (Exception ex)
using (var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(500)))
{
// Do nothing
await FlushAsync(cts.Token).ConfigureAwait(false);
}
}
catch
{
// Ignore errors during sync-mode flush
}
}
// Request cancellation of the async pipeline if it's still running
_asyncCts?.Cancel();
_asyncCts?.Dispose();
GC.SuppressFinalize(this);
}
EonaCat.LogStack/EonaCatLoggerCore/Flows/FileFlow.cs
+1 -1
View File
@@ -223,7 +223,7 @@ namespace EonaCat.LogStack.Flows
// Dedicated writer thread
_writerThread = new Thread(WriterThreadBody)
{
IsBackground = false,
IsBackground = true,
Name = "FileFlow.Writer[" + filePrefix + "]",
Priority = ThreadPriority.AboveNormal,
};