Skip to content

Commit def5790

Browse files
LiorBanaiLiorBanai
committed
update sink to v8.0.0.0
1 parent ab686d6 commit def5790

File tree

5 files changed

+37
-38
lines changed

5 files changed

+37
-38
lines changed

‎Analogy.LogViewer.Serilog.Sinks.MongoDB/Analogy.LogViewer.Serilog.Sinks.MongoDB.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515

1616
<ItemGroup>
17-
<PackageReference Include="Analogy.CommonUtilities" Version="8.0.0-a1" />
18-
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.0.0-a2" />
19-
<PackageReference Include="Analogy.LogViewer.Template" Version="8.0.0-a1" />
17+
<PackageReference Include="Analogy.CommonUtilities" Version="8.0.0" />
18+
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.0.0" />
19+
<PackageReference Include="Analogy.LogViewer.Template" Version="8.0.0" />
2020
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2121
<PackageReference Include="Serilog" Version="4.2.0" />
2222
<PackageReference Include="System.Resources.Extensions" Version="9.0.1" />

‎Analogy.LogViewer.Serilog.Sinks/Analogy.LogViewer.Serilog.Sinks.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net9.0;net8.0;net48</TargetFrameworks>
5-
<VersionPrefix>7.2.0</VersionPrefix>
5+
<VersionPrefix>8.0.0</VersionPrefix>
66
<VersionSuffix></VersionSuffix>
77
<Authors>Lior Banai</Authors>
88
<Company>Analogy.LogViewer</Company>
@@ -19,7 +19,7 @@
1919
</None>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<PackageReference Include="Analogy.LogServer.Clients" Version="7.2.0.1" />
22+
<PackageReference Include="Analogy.LogServer.Clients" Version="8.0.0" />
2323
<PackageReference Include="Serilog" Version="4.2.0" />
2424
</ItemGroup>
2525
</Project>

‎Analogy.LogViewer.Serilog.Sinks/AnalogyLogServerSink.cs‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Serilog.Events;
55
using System;
66
using System.Collections.Generic;
7+
using System.Threading.Tasks;
78

89
namespace Analogy.LogViewer.Serilog.Sinks
910
{
@@ -31,42 +32,29 @@ public AnalogyLogServerSink(IFormatProvider formatProvider, string address)
3132
public void Emit(LogEvent logEvent)
3233
{
3334
var alm = ParseLogEventProperties(logEvent, in _formatProvider);
34-
_ = (logServerMessageProducer?.Log(alm.Text, alm.Source, alm.Level, "", alm.MachineName, alm.User,
35-
alm.Module, alm.ProcessId, alm.ThreadId, alm.AdditionalProperties, alm.MethodName, alm.LineNumber, alm.FileName));
35+
if (logServerMessageProducer is not null)
36+
{
37+
SafeFireAndForget(logServerMessageProducer?.Log(alm.Text, alm.Source, alm.Level, "", alm.MachineName, alm.User,
38+
alm.Module, alm.ProcessId, alm.ThreadId, alm.AdditionalProperties, alm.MethodName, alm.LineNumber, alm.FileName));
39+
}
3640
}
3741

3842
public static AnalogyLogMessage ParseLogEventProperties(LogEvent evt, in IFormatProvider formatProvider)
3943
{
4044
AnalogyLogMessage m = new AnalogyLogMessage();
4145

42-
switch (evt.Level)
46+
m.Level = evt.Level switch
4347
{
44-
case LogEventLevel.Verbose:
45-
m.Level = AnalogyLogLevel.Verbose;
46-
break;
47-
case LogEventLevel.Debug:
48-
m.Level = AnalogyLogLevel.Debug;
49-
break;
50-
case LogEventLevel.Information:
51-
m.Level = AnalogyLogLevel.Information;
52-
break;
53-
case LogEventLevel.Warning:
54-
m.Level = AnalogyLogLevel.Warning;
55-
break;
56-
case LogEventLevel.Error:
57-
m.Level = AnalogyLogLevel.Error;
58-
break;
59-
case LogEventLevel.Fatal:
60-
m.Level = AnalogyLogLevel.Critical;
61-
break;
62-
default:
63-
{
64-
m.Level = AnalogyLogLevel.Unknown;
65-
break;
66-
}
67-
}
48+
LogEventLevel.Verbose => AnalogyLogLevel.Verbose,
49+
LogEventLevel.Debug => AnalogyLogLevel.Debug,
50+
LogEventLevel.Information => AnalogyLogLevel.Information,
51+
LogEventLevel.Warning => AnalogyLogLevel.Warning,
52+
LogEventLevel.Error => AnalogyLogLevel.Error,
53+
LogEventLevel.Fatal => AnalogyLogLevel.Critical,
54+
_ => AnalogyLogLevel.Unknown,
55+
};
6856

69-
m.Date = evt.Timestamp.DateTime;
57+
m.Date = evt.Timestamp;
7058
m.Text = evt.RenderMessage(formatProvider);
7159
if (evt.Properties.TryGetValue(Constants.ProcessName, out var processName))
7260
{
@@ -153,6 +141,17 @@ public static AnalogyLogMessage ParseLogEventProperties(LogEvent evt, in IFormat
153141
}
154142
return m;
155143
}
144+
public static async void SafeFireAndForget(Task task)
145+
{
146+
try
147+
{
148+
await task.ConfigureAwait(false);
149+
}
150+
catch (Exception)
151+
{
152+
//ignore
153+
}
154+
}
156155

157156
public void Dispose()
158157
{

‎Analogy.LogViewer.Serilog.UnitTests/Analogy.LogViewer.Serilog.UnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.0.0-a2" />
10+
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.0.0" />
1111
<PackageReference Include="System.Resources.Extensions" Version="9.0.1" />
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
1313
<PackageReference Include="MSTest.TestAdapter" Version="3.7.2" />

‎Analogy.LogViewer.Serilog/Analogy.LogViewer.Serilog.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
@@ -18,9 +18,9 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Analogy.CommonUtilities" Version="8.0.0-a1" />
22-
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.0.0-a2" />
23-
<PackageReference Include="Analogy.LogViewer.Template" Version="8.0.0-a1" />
21+
<PackageReference Include="Analogy.CommonUtilities" Version="8.0.0" />
22+
<PackageReference Include="Analogy.LogViewer.Interfaces" Version="8.0.0" />
23+
<PackageReference Include="Analogy.LogViewer.Template" Version="8.0.0" />
2424
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2525
<PackageReference Include="Serilog" Version="4.2.0" />
2626
<PackageReference Include="System.Resources.Extensions" Version="9.0.1" />

0 commit comments

Comments
 (0)