matt/LogViewerControl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Warnings

Browse Source
This commit is contained in:
Matthias Heil
2026-04-05 08:00:09 +02:00
parent dfb879bfb3
commit 511a5f9f51
21 changed files with 104 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CSharp/Core/Serilog.Sinks.LogView.Core/DataStoreLoggerSink.cs
+14 -20
View File
@@ -2,24 +2,18 @@
using LogViewer.Core;
using Microsoft.Extensions.Logging;
using Serilog.Core;
using System.Globalization;
namespace Serilog.Sinks.LogView.Core;
public class DataStoreLoggerSink : ILogEventSink
public class DataStoreLoggerSink(
Func<ILogDataStore> dataStoreProvider,
Func<DataStoreLoggerConfiguration>? getCurrentConfig = null,
IFormatProvider? formatProvider = null) : ILogEventSink
{
protected readonly Func<ILogDataStore> _dataStoreProvider;
private readonly IFormatProvider? _formatProvider;
private readonly Func<DataStoreLoggerConfiguration>? _getCurrentConfig;
public DataStoreLoggerSink(Func<ILogDataStore> dataStoreProvider,
Func<DataStoreLoggerConfiguration>? getCurrentConfig = null,
IFormatProvider? formatProvider = null)
{
_formatProvider = formatProvider;
_dataStoreProvider = dataStoreProvider;
_getCurrentConfig = getCurrentConfig;
}
protected Func<ILogDataStore> DataStoreProvider { get; } = dataStoreProvider;
private IFormatProvider? FormatProvider { get; } = formatProvider;
private Func<DataStoreLoggerConfiguration>? GetCurrentConfig { get; } = getCurrentConfig;
public void Emit(LogEvent logEvent)
{
@@ -33,13 +27,13 @@ public class DataStoreLoggerSink : ILogEventSink
_ => LogLevel.Information
};
DataStoreLoggerConfiguration config = _getCurrentConfig?.Invoke() ?? new DataStoreLoggerConfiguration();
DataStoreLoggerConfiguration config = GetCurrentConfig?.Invoke() ?? new DataStoreLoggerConfiguration();
EventId eventId = EventIdFactory(logEvent);
if (eventId.Id == 0 && config.EventId != 0)
eventId = config.EventId;
string message = logEvent.RenderMessage(_formatProvider);
string message = logEvent.RenderMessage(FormatProvider);
string exception = logEvent.Exception?.Message ?? (logEvent.Level >= LogEventLevel.Error ? message : string.Empty);
@@ -50,7 +44,7 @@ public class DataStoreLoggerSink : ILogEventSink
protected virtual void AddLogEntry(LogLevel logLevel, EventId eventId, string message, string exception, LogEntryColor color)
{
ILogDataStore? dataStore = _dataStoreProvider.Invoke();
ILogDataStore? dataStore = DataStoreProvider.Invoke();
// ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
if (dataStore == null)
@@ -79,11 +73,11 @@ public class DataStoreLoggerSink : ILogEventSink
// ref: https://stackoverflow.com/a/56722516
StructureValue? value = src as StructureValue;
LogEventProperty? idProperty = value!.Properties.FirstOrDefault(x => x.Name.Equals("Id"));
LogEventProperty? idProperty = value!.Properties.FirstOrDefault(x => x.Name.Equals("Id", StringComparison.Ordinal));
if (idProperty is not null)
id = int.Parse(idProperty.Value.ToString());
id = int.Parse(idProperty.Value.ToString(),CultureInfo.InvariantCulture);
LogEventProperty? nameProperty = value.Properties.FirstOrDefault(x => x.Name.Equals("Name"));
LogEventProperty? nameProperty = value.Properties.FirstOrDefault(x => x.Name.Equals("Name", StringComparison.Ordinal));
if (nameProperty is not null)
eventName = nameProperty.Value.ToString().Trim('"');