From be5c1c9c2153a5ed96d49bc4159f888404cad378 Mon Sep 17 00:00:00 2001
From: Stuart Ferguson <stuart_ferguson1@btinternet.com>
Date: Wed, 19 Jan 2022 20:31:47 +0000
Subject: [PATCH] Add health check filter

---
 .../TransactionProcessor.BusinessLogic.csproj |  4 +--
 ...ansactionProcessor.IntegrationTests.csproj |  2 +-
 ...ocessor.Reconciliation.DomainEvents.csproj |  2 +-
 ...onProcessor.ReconciliationAggregate.csproj |  2 +-
 ...onProcessor.Settlement.DomainEvents.csproj |  2 +-
 ...ctionProcessor.SettlementAggregates.csproj |  2 +-
 ...nProcessor.Transaction.DomainEvents.csproj |  2 +-
 ...ctionProcessor.TransactionAggregate.csproj |  2 +-
 TransactionProcessor/Startup.cs               |  1 -
 .../TransactionProcessor.csproj               |  4 +--
 TransactionProcessor/nlog.config              | 26 ++++++++++++++++---
 TransactionProcessor/nlog.development.config  | 19 --------------
 12 files changed, 33 insertions(+), 35 deletions(-)
 delete mode 100644 TransactionProcessor/nlog.development.config

diff --git a/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj b/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
index 99fa6cde..81cf0682 100644
--- a/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
+++ b/TransactionProcessor.BusinessLogic/TransactionProcessor.BusinessLogic.csproj
@@ -8,8 +8,8 @@
     <PackageReference Include="EstateManagement.Client" Version="1.0.17-build86" />
     <PackageReference Include="MessagingService.Client" Version="1.0.14-build56" />
     <PackageReference Include="SecurityService.Client" Version="1.0.8" />
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.4" />
-    <PackageReference Include="Shared.EventStore" Version="1.1.4" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.5" />
+    <PackageReference Include="Shared.EventStore" Version="1.1.5" />
     <PackageReference Include="MediatR" Version="9.0.0" />
     <PackageReference Include="System.IO.Abstractions" Version="13.2.9" />
     <PackageReference Include="VoucherManagement.Client" Version="1.0.8-build38" />
diff --git a/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj b/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj
index 232516ec..a156bfc0 100644
--- a/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj
+++ b/TransactionProcessor.IntegrationTests/TransactionProcessor.IntegrationTests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.12" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
     <PackageReference Include="SecurityService.Client" Version="1.0.8" />
-    <PackageReference Include="Shared.IntegrationTesting" Version="1.1.4" />
+    <PackageReference Include="Shared.IntegrationTesting" Version="1.1.5" />
     <PackageReference Include="Shouldly" Version="4.0.3" />
     <PackageReference Include="SpecFlow" Version="3.5.14" />
     <PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.5.14" />
diff --git a/TransactionProcessor.Reconciliation.DomainEvents/TransactionProcessor.Reconciliation.DomainEvents.csproj b/TransactionProcessor.Reconciliation.DomainEvents/TransactionProcessor.Reconciliation.DomainEvents.csproj
index 8b3ad945..eb7f1d58 100644
--- a/TransactionProcessor.Reconciliation.DomainEvents/TransactionProcessor.Reconciliation.DomainEvents.csproj
+++ b/TransactionProcessor.Reconciliation.DomainEvents/TransactionProcessor.Reconciliation.DomainEvents.csproj
@@ -5,6 +5,6 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.0" />
+		<PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.5" />
 	</ItemGroup>
 </Project>
diff --git a/TransactionProcessor.ReconciliationAggregate/TransactionProcessor.ReconciliationAggregate.csproj b/TransactionProcessor.ReconciliationAggregate/TransactionProcessor.ReconciliationAggregate.csproj
index bbdf8af2..8bcb7716 100644
--- a/TransactionProcessor.ReconciliationAggregate/TransactionProcessor.ReconciliationAggregate.csproj
+++ b/TransactionProcessor.ReconciliationAggregate/TransactionProcessor.ReconciliationAggregate.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.EventStore" Version="1.1.4" />
+    <PackageReference Include="Shared.EventStore" Version="1.1.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TransactionProcessor.Settlement.DomainEvents/TransactionProcessor.Settlement.DomainEvents.csproj b/TransactionProcessor.Settlement.DomainEvents/TransactionProcessor.Settlement.DomainEvents.csproj
index 4842d832..f9b4b28c 100644
--- a/TransactionProcessor.Settlement.DomainEvents/TransactionProcessor.Settlement.DomainEvents.csproj
+++ b/TransactionProcessor.Settlement.DomainEvents/TransactionProcessor.Settlement.DomainEvents.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.0" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.5" />
   </ItemGroup>
 
 </Project>
diff --git a/TransactionProcessor.SettlementAggregates/TransactionProcessor.SettlementAggregates.csproj b/TransactionProcessor.SettlementAggregates/TransactionProcessor.SettlementAggregates.csproj
index a9d2b809..0fa3eb87 100644
--- a/TransactionProcessor.SettlementAggregates/TransactionProcessor.SettlementAggregates.csproj
+++ b/TransactionProcessor.SettlementAggregates/TransactionProcessor.SettlementAggregates.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.EventStore" Version="1.1.4" />
+    <PackageReference Include="Shared.EventStore" Version="1.1.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TransactionProcessor.Transaction.DomainEvents/TransactionProcessor.Transaction.DomainEvents.csproj b/TransactionProcessor.Transaction.DomainEvents/TransactionProcessor.Transaction.DomainEvents.csproj
index b22984e0..386df977 100644
--- a/TransactionProcessor.Transaction.DomainEvents/TransactionProcessor.Transaction.DomainEvents.csproj
+++ b/TransactionProcessor.Transaction.DomainEvents/TransactionProcessor.Transaction.DomainEvents.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.0" />
+    <PackageReference Include="Shared.DomainDrivenDesign" Version="1.1.5" />
   </ItemGroup>
 
 </Project>
diff --git a/TransactionProcessor.TransactionAgrgegate/TransactionProcessor.TransactionAggregate.csproj b/TransactionProcessor.TransactionAgrgegate/TransactionProcessor.TransactionAggregate.csproj
index c8a1c8af..442f9898 100644
--- a/TransactionProcessor.TransactionAgrgegate/TransactionProcessor.TransactionAggregate.csproj
+++ b/TransactionProcessor.TransactionAgrgegate/TransactionProcessor.TransactionAggregate.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Shared.EventStore" Version="1.1.4" />
+    <PackageReference Include="Shared.EventStore" Version="1.1.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/TransactionProcessor/Startup.cs b/TransactionProcessor/Startup.cs
index ca036268..bf554019 100644
--- a/TransactionProcessor/Startup.cs
+++ b/TransactionProcessor/Startup.cs
@@ -402,7 +402,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
 
             if (env.IsDevelopment())
             {
-                nlogConfigFilename = $"nlog.{env.EnvironmentName}.config";
                 app.UseDeveloperExceptionPage();
             }
 
diff --git a/TransactionProcessor/TransactionProcessor.csproj b/TransactionProcessor/TransactionProcessor.csproj
index 59988a5e..ca38e68c 100644
--- a/TransactionProcessor/TransactionProcessor.csproj
+++ b/TransactionProcessor/TransactionProcessor.csproj
@@ -29,8 +29,8 @@
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.1" />
     <PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
-    <PackageReference Include="Shared" Version="1.1.4" />
-    <PackageReference Include="Shared.EventStore" Version="1.1.4" />
+    <PackageReference Include="Shared" Version="1.1.5" />
+    <PackageReference Include="Shared.EventStore" Version="1.1.5" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.1" />
     <PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="7.0.2" />
diff --git a/TransactionProcessor/nlog.config b/TransactionProcessor/nlog.config
index 1457883d..0dd53505 100644
--- a/TransactionProcessor/nlog.config
+++ b/TransactionProcessor/nlog.config
@@ -11,10 +11,28 @@
               archiveEvery="Hour"
               keepFileOpen="false"
               maxArchiveFiles="24"/>
+      <target name="healthlogfile" xsi:type="File"
+              fileName="/home/txnproc/trace/transactionprocessor_health.log"
+              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= | }"
+              archiveNumbering="Date"
+              archiveDateFormat="yyyyMMdd-HH"
+              archiveEvery="Hour"
+              keepFileOpen="false"
+              maxArchiveFiles="24"/>
     </target>
   </targets>
- 
-  <rules>
-    <logger name="*" minlevel="Debug" writeTo="logfile"/>
-  </rules>
+
+	<rules>
+		<logger name="Microsoft.*" minlevel="Debug" writeTo="" final="true" />
+		<logger name="*" minlevel="Debug" writeTo="logfile">
+			<filters defaultAction="Log">
+				<when condition="contains('${message}', 'HEALTH_CHECK')" action="Ignore"></when>
+			</filters>
+		</logger>
+		<logger name="*" minlevel="Debug" writeTo="healthlogfile">
+			<filters defaultAction="Ignore">
+				<when condition="contains('${message}', 'HEALTH_CHECK')" action="Log"></when>
+			</filters>
+		</logger>
+	</rules>
 </nlog> 
\ No newline at end of file
diff --git a/TransactionProcessor/nlog.development.config b/TransactionProcessor/nlog.development.config
deleted file mode 100644
index 18ec9007..00000000
--- a/TransactionProcessor/nlog.development.config
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<nlog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- 
-  <targets>
-    <target name="asyncFile" xsi:type="AsyncWrapper">
-      <target name="logfile" xsi:type="File"
-              fileName="/home/txnproc/trace/transactionprocessor_dev.log"
-              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= | }"
-              archiveNumbering="Date"
-              archiveDateFormat="yyyyMMdd-HH"
-              archiveEvery="Hour"
-              keepFileOpen="false"/>
-    </target>
-  </targets>
- 
-  <rules>
-    <logger name="*" minlevel="Debug" writeTo="logfile"/>
-  </rules>
-</nlog> 
\ No newline at end of file