Skip to content

Commit b549652

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #107 from TransactionProcessing/task/#105_addhealthchecks
Filter health check logging
2 parents 431215e + 79d0728 commit b549652

10 files changed

Lines changed: 33 additions & 16 deletions

File tree

‎FileProcessor.BusinessLogic/FileProcessor.BusinessLogic.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<PackageReference Include="EstateReporting.Database" Version="1.0.18.2" />
1010
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.12" />
1111
<PackageReference Include="SecurityService.Client" Version="1.0.8" />
12-
<PackageReference Include="Shared" Version="1.1.4" />
13-
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.4" />
12+
<PackageReference Include="Shared" Version="1.1.5" />
13+
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.5" />
1414
<PackageReference Include="MediatR" Version="9.0.0" />
15-
<PackageReference Include="Shared.EventStore" Version="1.1.4" />
15+
<PackageReference Include="Shared.EventStore" Version="1.1.5" />
1616
<PackageReference Include="System.IO.Abstractions" Version="13.2.29" />
1717
<PackageReference Include="TransactionProcessor.Client" Version="1.0.16.3" />
1818
</ItemGroup>

‎FileProcessor.Client/FileProcessor.Client.csproj‎

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

88
<ItemGroup>
9-
<PackageReference Include="ClientProxyBase" Version="1.1.0" />
9+
<PackageReference Include="ClientProxyBase" Version="1.1.5" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎FileProcessor.File.DomainEvents/FileProcessor.File.DomainEvents.csproj‎

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

77
<ItemGroup>
8-
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.4" />
8+
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.5" />
99
</ItemGroup>
1010

1111
</Project>

‎FileProcessor.FileAggregate/FileProcessor.FileAggregate.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.4" />
9-
<PackageReference Include="Shared.EventStore" Version="1.1.4" />
8+
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.5" />
9+
<PackageReference Include="Shared.EventStore" Version="1.1.5" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎FileProcessor.FileImportLog.DomainEvents/FileProcessor.FileImportLog.DomainEvents.csproj‎

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

77
<ItemGroup>
8-
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.4" />
8+
<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.5" />
99
</ItemGroup>
1010

1111
</Project>

‎FileProcessor.FileImportLogAggregate/FileProcessor.FileImportLogAggregate.csproj‎

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

77
<ItemGroup>
8-
<PackageReference Include="Shared.EventStore" Version="1.1.4" />
8+
<PackageReference Include="Shared.EventStore" Version="1.1.5" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎FileProcessor.IntegrationTests/FileProcessor.IntegrationTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="EventStore.Client.Grpc.Streams" Version="20.10.0" />
1818
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
1919
<PackageReference Include="SecurityService.Client" Version="1.0.8" />
20-
<PackageReference Include="Shared.IntegrationTesting" Version="1.1.4" />
20+
<PackageReference Include="Shared.IntegrationTesting" Version="1.1.5" />
2121
<PackageReference Include="Shouldly" Version="4.0.3" />
2222
<PackageReference Include="SpecFlow.xUnit" Version="3.7.38" />
2323
<PackageReference Include="xunit" Version="2.4.1" />

‎FileProcessor/FileProcessor.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.13" />
1818
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.2" />
1919
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
20-
<PackageReference Include="Shared" Version="1.1.4" />
20+
<PackageReference Include="Shared" Version="1.1.5" />
2121
<PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
2222
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
2323
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />

‎FileProcessor/Startup.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ namespace FileProcessor
5454
using Shared.Extensions;
5555
using Shared.General;
5656
using Shared.Logger;
57+
using Shared.Middleware;
5758
using Shared.Repositories;
5859
using Swashbuckle.AspNetCore.Filters;
5960
using TransactionProcessor.Client;
@@ -399,7 +400,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
399400

400401
if (env.IsDevelopment())
401402
{
402-
nlogConfigFilename = $"nlog.{env.EnvironmentName}.config";
403403
app.UseDeveloperExceptionPage();
404404
}
405405

@@ -421,7 +421,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
421421
app.AddRequestLogging();
422422
app.AddResponseLogging();
423423
app.AddExceptionHandler();
424-
424+
425425
app.UseRouting();
426426

427427
app.UseAuthentication();

‎FileProcessor/nlog.config‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<nlog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3-
43
<targets>
54
<target name="asyncFile" xsi:type="AsyncWrapper">
65
<target name="logfile" xsi:type="File"
@@ -10,11 +9,29 @@
109
archiveDateFormat="yyyyMMdd-HH"
1110
archiveEvery="Hour"
1211
keepFileOpen="false"
13-
maxArchiveFiles="24"/>/>
12+
maxArchiveFiles="24"/>
13+
<target name="healthlogfile" xsi:type="File"
14+
fileName="/home/txnproc/trace/fileprocessor_health.log"
15+
layout="${date:format=dd/MM/yyyy HH\:mm\:ss} | ${date:format=dd/MM/yyyy HH\:mm\:ss.ffff} | ${level} | ${callsite:className=true} | ${message} | ${exception:format=type,method:maxInnerExceptionLevel=5:innerFormat=shortType,message,method:InnerExceptionSeparator= | }"
16+
archiveNumbering="Date"
17+
archiveDateFormat="yyyyMMdd-HH"
18+
archiveEvery="Hour"
19+
keepFileOpen="false"
20+
maxArchiveFiles="24"/>
1421
</target>
1522
</targets>
1623

1724
<rules>
18-
<logger name="*" minlevel="Debug" writeTo="logfile"/>
25+
<logger name="Microsoft.*" minlevel="Debug" writeTo="" final="true" />
26+
<logger name="*" minlevel="Debug" writeTo="logfile">
27+
<filters defaultAction="Log">
28+
<when condition="contains('${message}', 'HEALTH_CHECK')" action="Ignore"></when>
29+
</filters>
30+
</logger>
31+
<logger name="*" minlevel="Debug" writeTo="healthlogfile">
32+
<filters defaultAction="Ignore">
33+
<when condition="contains('${message}', 'HEALTH_CHECK')" action="Log"></when>
34+
</filters>
35+
</logger>
1936
</rules>
2037
</nlog>

0 commit comments

Comments
 (0)