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:
Jeroen Saey
2026-07-31 15:05:00 +02:00
parent fe14369bf8
commit 4d75deea6f
8 changed files with 67 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EonaCat.LogStack.LogClient/EonaCat.LogStack.LogClient.csproj
+1 -1
View File
@@ -25,7 +25,7 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Net.Http.Json" Version="10.0.9" /> <PackageReference Include="System.Net.Http.Json" Version="10.0.10" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\EonaCat.LogStack\EonaCat.LogStack.csproj" /> <ProjectReference Include="..\EonaCat.LogStack\EonaCat.LogStack.csproj" />
EonaCat.LogStack.OpenTelemetryFlow/EonaCat.LogStack.OpenTelemetryFlow.csproj
+4 -4
View File
@@ -32,10 +32,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="OpenTelemetry" Version="1.16.0" /> <PackageReference Include="OpenTelemetry" Version="1.17.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.16.0" /> <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.17.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.16.0" /> <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.17.0" />
<PackageReference Include="System.Threading.AccessControl" Version="10.0.9" /> <PackageReference Include="System.Threading.AccessControl" Version="10.0.10" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
EonaCat.LogStack.Status/EonaCat.LogStack.Status.csproj
+2 -2
View File
@@ -7,8 +7,8 @@
<GeneratePackageOnBuild>False</GeneratePackageOnBuild> <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.9" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.9"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.10">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
EonaCat.LogStack.WindowsEventLogFlow/EonaCat.LogStack.Flows.WindowsEventLog.csproj
+2 -2
View File
@@ -35,8 +35,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="System.Diagnostics.EventLog" Version="10.0.9" /> <PackageReference Include="System.Diagnostics.EventLog" Version="10.0.10" />
<PackageReference Include="System.Threading.AccessControl" Version="10.0.9" /> <PackageReference Include="System.Threading.AccessControl" Version="10.0.10" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
EonaCat.LogStack/EonaCat.LogStack.csproj
+10 -10
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> <Copyright>EonaCat (Jeroen Saey)</Copyright>
<PackageTags>EonaCat;Logger;EonaCatLogStack;Log;Writer;Flows;LogStack;Memory;Speed;Jeroen;Saey</PackageTags> <PackageTags>EonaCat;Logger;EonaCatLogStack;Log;Writer;Flows;LogStack;Memory;Speed;Jeroen;Saey</PackageTags>
<PackageIconUrl /> <PackageIconUrl />
<FileVersion>0.1.7</FileVersion> <FileVersion>0.1.8</FileVersion>
<PackageReadmeFile>README.md</PackageReadmeFile> <PackageReadmeFile>README.md</PackageReadmeFile>
<GenerateDocumentationFile>True</GenerateDocumentationFile> <GenerateDocumentationFile>True</GenerateDocumentationFile>
<PackageLicenseFile>LICENSE</PackageLicenseFile> <PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -25,7 +25,7 @@ It features a rich fluent API for routing log events to dozens of destinations f
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<EVRevisionFormat>0.1.7+{chash:10}.{c:ymd}</EVRevisionFormat> <EVRevisionFormat>0.1.8+{chash:10}.{c:ymd}</EVRevisionFormat>
<EVDefault>true</EVDefault> <EVDefault>true</EVDefault>
<EVInfo>true</EVInfo> <EVInfo>true</EVInfo>
<EVTagMatch>v[0-9]*</EVTagMatch> <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>
<PropertyGroup> <PropertyGroup>
<Version>0.1.7</Version> <Version>0.1.8</Version>
<PackageId>EonaCat.LogStack</PackageId> <PackageId>EonaCat.LogStack</PackageId>
<Product>EonaCat.LogStack</Product> <Product>EonaCat.LogStack</Product>
<RepositoryUrl>https://git.saey.me/EonaCat/EonaCat.LogStack</RepositoryUrl> <RepositoryUrl>https://git.saey.me/EonaCat/EonaCat.LogStack</RepositoryUrl>
@@ -85,19 +85,19 @@ It features a rich fluent API for routing log events to dozens of destinations f
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EonaCat.Json" Version="2.2.4" /> <PackageReference Include="EonaCat.Json" Version="2.2.5" />
<PackageReference Include="EonaCat.Versioning" Version="1.5.8"> <PackageReference Include="EonaCat.Versioning" Version="1.6.4">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="EonaCat.Versioning.Helpers" Version="1.5.1" /> <PackageReference Include="EonaCat.Versioning.Helpers" Version="1.5.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.9" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.9" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.10" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.9" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.10" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Threading.Channels" Version="10.0.9" /> <PackageReference Include="System.Threading.Channels" Version="10.0.10" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
EonaCat.LogStack/EonaCatLogger.cs
+31 -3
View File
@@ -718,25 +718,53 @@ namespace EonaCat.LogStack
// Drain and stop the async channel pipeline if active // Drain and stop the async channel pipeline if active
if (_asyncChannel != null) 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
_asyncChannel.Writer.TryComplete(); _asyncChannel.Writer.TryComplete();
if (_asyncConsumer != null) 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)))
{ {
try try
{ {
await _asyncConsumer.ConfigureAwait(false); await _asyncConsumer.ConfigureAwait(false);
} }
catch (OperationCanceledException)
{
// Do nothing
}
}
}
catch (Exception ex) catch (Exception ex)
{ {
System.Diagnostics.Debug.WriteLine(ex); // Do nothing
} }
} }
} }
else
{
// If using synchronous mode, just flush
await FlushAsync().ConfigureAwait(false); await FlushAsync().ConfigureAwait(false);
}
var disposeTasks = _concurrentFlows.Select(f => f.DisposeAsync().AsTask()); // Dispose flows - they should already be flushed above
var disposeTasks = _concurrentFlows.Select(f => f.DisposeAsync().AsTask()).ToArray();
try
{
await Task.WhenAll(disposeTasks).ConfigureAwait(false); await Task.WhenAll(disposeTasks).ConfigureAwait(false);
}
catch (Exception ex)
{
// Do nothing
}
_asyncCts?.Dispose(); _asyncCts?.Dispose();
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
EonaCat.LogStack/EonaCatLoggerCore/Memory/MemoryOptimizations.cs
-1
View File
@@ -70,7 +70,6 @@ public static class MemoryOptimizations
public static void TryCompact() public static void TryCompact()
{ {
GC.Collect(GC.MaxGeneration, GCCollectionMode.Optimized, false); GC.Collect(GC.MaxGeneration, GCCollectionMode.Optimized, false);
GC.WaitForPendingFinalizers();
} }
/// <summary> /// <summary>
Testers/EonaCat.LogStack.Test.Web/EonaCat.LogStack.Test.Web.csproj
+1 -1
View File
@@ -7,7 +7,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="EonaCat.Versioning" Version="1.5.8"> <PackageReference Include="EonaCat.Versioning" Version="1.6.4">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>