Skip to content

Commit 330a4c2

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #277 from TransactionProcessing/task/#276_trace_review
trace improvements
2 parents e7ff45d + 4dd2f59 commit 330a4c2

File tree

7 files changed

+76
-28
lines changed

7 files changed

+76
-28
lines changed

‎TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
<ItemGroup>
88
<PackageReference Include="MediatR" Version="12.2.0" />
9-
<PackageReference Include="SecurityService.Client" Version="2024.4.2" />
10-
<PackageReference Include="Shared" Version="2024.4.3" />
11-
<PackageReference Include="TransactionProcessor.Client" Version="2024.4.3-build102" />
12-
<PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.4.3-build102" />
13-
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.4.3-build102" />
9+
<PackageReference Include="SecurityService.Client" Version="2024.5.1" />
10+
<PackageReference Include="Shared" Version="2024.7.1" />
11+
<PackageReference Include="TransactionProcessor.Client" Version="2024.6.2" />
12+
<PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.6.2" />
13+
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.6.2" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="ClientProxyBase" Version="2024.4.3" />
10+
<PackageReference Include="ClientProxyBase" Version="2024.7.1" />
1111
<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
12-
<PackageReference Include="EstateManagement.Client" Version="2024.4.3-build103" />
13-
<PackageReference Include="EstateManagement.Database" Version="2024.4.3-build103" />
14-
<PackageReference Include="EstateManagement.IntegrationTesting.Helpers" Version="2024.4.3-build103" />
12+
<PackageReference Include="EstateManagement.Client" Version="2024.6.5" />
13+
<PackageReference Include="EstateManagement.Database" Version="2024.6.5" />
14+
<PackageReference Include="EstateManagement.IntegrationTesting.Helpers" Version="2024.6.5" />
1515
<PackageReference Include="EventStoreProjections" Version="2023.12.3" />
1616
<PackageReference Include="MessagingService.IntegrationTesting.Helpers" Version="2024.4.2" />
1717
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
@@ -22,12 +22,12 @@
2222
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
2323
<PackageReference Include="Reqnroll" Version="1.0.1" />
2424
<PackageReference Include="Reqnroll.NUnit" Version="1.0.1" />
25-
<PackageReference Include="SecurityService.Client" Version="2024.4.2" />
26-
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2024.4.2" />
27-
<PackageReference Include="Shared.IntegrationTesting" Version="2024.4.3" />
25+
<PackageReference Include="SecurityService.Client" Version="2024.5.1" />
26+
<PackageReference Include="SecurityService.IntegrationTesting.Helpers" Version="2024.5.1" />
27+
<PackageReference Include="Shared.IntegrationTesting" Version="2024.7.1" />
2828
<PackageReference Include="Shouldly" Version="4.2.1" />
29-
<PackageReference Include="TransactionProcessor.Client" Version="2024.4.3-build102" />
30-
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.4.3-build102" />
29+
<PackageReference Include="TransactionProcessor.Client" Version="2024.6.2" />
30+
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.6.2" />
3131

3232
<PackageReference Include="coverlet.collector" Version="6.0.2">
3333
<PrivateAssets>all</PrivateAssets>

‎TransactionProcessorACL.Testing/TransactionProcessorACL.Testing.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="TransactionProcessor.Client" Version="2024.4.3-build102" />
10-
<PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.4.3-build102" />
11-
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.4.3-build102" />
9+
<PackageReference Include="TransactionProcessor.Client" Version="2024.6.2" />
10+
<PackageReference Include="TransactionProcessor.Float.DomainEvents" Version="2024.6.2" />
11+
<PackageReference Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2024.6.2" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎TransactionProcessorACL/Bootstrapper/MiscRegistry.cs‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
namespace TransactionProcessorACL.Bootstrapper
1+
using Microsoft.Extensions.Logging;
2+
3+
namespace TransactionProcessorACL.Bootstrapper
24
{
35
using Factories;
46
using Lamar;
57
using Microsoft.Extensions.DependencyInjection;
8+
using Shared.General;
9+
using Shared.Middleware;
10+
using System.Collections.Generic;
11+
using System;
612
using System.Diagnostics.CodeAnalysis;
713

814
/// <summary>
@@ -19,9 +25,40 @@ public class MiscRegistry : ServiceRegistry
1925
/// </summary>
2026
public MiscRegistry()
2127
{
28+
bool logRequests = ConfigurationReaderExtensions.GetValueOrDefault<Boolean>("MiddlewareLogging", "LogRequests", true);
29+
bool logResponses = ConfigurationReaderExtensions.GetValueOrDefault<Boolean>("MiddlewareLogging", "LogResponses", true);
30+
LogLevel middlewareLogLevel = ConfigurationReaderExtensions.GetValueOrDefault<LogLevel>("MiddlewareLogging", "MiddlewareLogLevel", LogLevel.Warning);
31+
32+
RequestResponseMiddlewareLoggingConfig config =
33+
new RequestResponseMiddlewareLoggingConfig(middlewareLogLevel, logRequests, logResponses);
34+
2235
this.AddSingleton<IModelFactory, ModelFactory>();
36+
37+
this.AddSingleton(config);
2338
}
2439

2540
#endregion
2641
}
42+
43+
public static class ConfigurationReaderExtensions
44+
{
45+
public static T GetValueOrDefault<T>(String sectionName, String keyName, T defaultValue)
46+
{
47+
try
48+
{
49+
var value = ConfigurationReader.GetValue(sectionName, keyName);
50+
51+
if (String.IsNullOrEmpty(value))
52+
{
53+
return defaultValue;
54+
}
55+
56+
return (T)Convert.ChangeType(value, typeof(T));
57+
}
58+
catch (KeyNotFoundException kex)
59+
{
60+
return defaultValue;
61+
}
62+
}
63+
}
2764
}

‎TransactionProcessorACL/Startup.cs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
8989

9090
if (env.IsDevelopment())
9191
{
92+
var developmentNlogConfigFilename = "nlog.development.config";
93+
if (File.Exists(Path.Combine(env.ContentRootPath, developmentNlogConfigFilename)))
94+
{
95+
nlogConfigFilename = developmentNlogConfigFilename;
96+
}
97+
9298
app.UseDeveloperExceptionPage();
9399
}
94100

@@ -98,12 +104,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
98104
ILogger logger = loggerFactory.CreateLogger("TransactionProcessor");
99105

100106
Logger.Initialise(logger);
101-
102-
Action<String> loggerAction = message =>
103-
{
104-
Logger.LogInformation(message);
105-
};
106-
Startup.Configuration.LogConfiguration(loggerAction);
107+
108+
Startup.Configuration.LogConfiguration(Logger.LogWarning);
107109

108110
app.AddRequestLogging();
109111
app.AddResponseLogging();

‎TransactionProcessorACL/TransactionProcessorACL.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
2727
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2828
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
29-
<PackageReference Include="Shared" Version="2024.4.3" />
29+
<PackageReference Include="Shared" Version="2024.7.1" />
3030
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
3131
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
3232
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.1" />

‎TransactionProcessorACL/nlog.config‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,23 @@
2222
</target>
2323
</targets>
2424

25+
<!--
26+
Trace - Very detailed log messages, potentially of a high frequency and volume
27+
Debug -Less detailed and/or less frequent debugging messages
28+
Info - Informational messages
29+
Warn - Warnings which don't appear to the user of the application
30+
Error - Error messages
31+
Fatal - Fatal error messages. After a fatal error, the application usually terminates
32+
-->
33+
2534
<rules>
26-
<logger name="Microsoft.*" minlevel="Debug" writeTo="" final="true" />
27-
<logger name="*" minlevel="Debug" writeTo="logfile">
35+
<logger name="Microsoft.*" minlevel="Warn" writeTo="" final="true" />
36+
<logger name="*" minlevel="Warn" writeTo="logfile">
2837
<filters defaultAction="Log">
2938
<when condition="contains('${message}', 'HEALTH_CHECK')" action="Ignore"></when>
3039
</filters>
3140
</logger>
32-
<logger name="*" minlevel="Debug" writeTo="healthlogfile">
41+
<logger name="*" minlevel="Warn" writeTo="healthlogfile">
3342
<filters defaultAction="Ignore">
3443
<when condition="contains('${message}', 'HEALTH_CHECK')" action="Log"></when>
3544
</filters>

0 commit comments

Comments
 (0)