Skip to content

Commit 805baba

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #98 from TransactionProcessing/task/#97_trace_review
trace improvements
2 parents d8d68fa + 34ed92e commit 805baba

File tree

10 files changed

+70
-24
lines changed

10 files changed

+70
-24
lines changed

‎CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ItemGroup>
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1111
<PackageReference Include="Moq" Version="4.20.70" />
12-
<PackageReference Include="Shared.EventStore" Version="2024.4.1" />
12+
<PackageReference Include="Shared.EventStore" Version="2024.7.1" />
1313
<PackageReference Include="Shouldly" Version="4.2.1" />
1414
<PackageReference Include="xunit" Version="2.7.0" />
1515
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">

‎CallbackHandler.BusinessLogic/CallbackHandler.BusinessLogic.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageReference Include="MediatR" Version="12.2.0" />
8-
<PackageReference Include="Shared" Version="2024.4.1" />
9-
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.4.1" />
10-
<PackageReference Include="Shared.EventStore" Version="2024.4.1" />
8+
<PackageReference Include="Shared" Version="2024.7.1" />
9+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.7.1" />
10+
<PackageReference Include="Shared.EventStore" Version="2024.7.1" />
1111
</ItemGroup>
1212
<ItemGroup>
1313
<ProjectReference Include="..\CallbackHandler.CallbackMessageAggregate\CallbackHandler.CallbackMessageAggregate.csproj" />

‎CallbackHandler.CallbackMessage.DomainEvents/CallbackHandler.CallbackMessage.DomainEvents.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>net8.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="Shared" Version="2024.4.1" />
8-
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.4.1" />
7+
<PackageReference Include="Shared" Version="2024.7.1" />
8+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.7.1" />
99
</ItemGroup>
1010
</Project>

‎CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
11-
<PackageReference Include="Shared.EventStore" Version="2024.4.1" />
11+
<PackageReference Include="Shared.EventStore" Version="2024.7.1" />
1212
<PackageReference Include="Shouldly" Version="4.2.1" />
1313
<PackageReference Include="xunit" Version="2.7.0" />
1414
<PackageReference Include="xunit.extensibility.core" Version="2.7.0" />

‎CallbackHandler.CallbackMessageAggregate/CallbackHandler.CallbackMessageAggregate.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</ItemGroup>
1111
<ItemGroup>
1212
<PackageReference Include="Grpc.Net.Client" Version="2.61.0" />
13-
<PackageReference Include="Shared" Version="2024.4.1" />
14-
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.4.1" />
15-
<PackageReference Include="Shared.EventStore" Version="2024.4.1" />
13+
<PackageReference Include="Shared" Version="2024.7.1" />
14+
<PackageReference Include="Shared.DomainDrivenDesign" Version="2024.7.1" />
15+
<PackageReference Include="Shared.EventStore" Version="2024.7.1" />
1616
</ItemGroup>
1717
</Project>

‎CallbackHandler/Bootstrapper/MiddlewareRegistry.cs‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
namespace CallbackHandler.Bootstrapper
1+
using Microsoft.Extensions.Logging;
2+
3+
namespace CallbackHandler.Bootstrapper
24
{
35
using System;
6+
using System.Collections.Generic;
47
using System.Diagnostics.CodeAnalysis;
58
using System.IO;
69
using System.Reflection;
@@ -14,6 +17,8 @@
1417
using Newtonsoft.Json;
1518
using Newtonsoft.Json.Serialization;
1619
using Shared.EventStore.Extensions;
20+
using Shared.General;
21+
using Shared.Middleware;
1722
using Swashbuckle.AspNetCore.Filters;
1823

1924
[ExcludeFromCodeCoverage]
@@ -71,6 +76,37 @@ public MiddlewareRegistry()
7176

7277
Assembly assembly = this.GetType().GetTypeInfo().Assembly;
7378
this.AddMvcCore().AddApplicationPart(assembly).AddControllersAsServices();
79+
80+
bool logRequests = ConfigurationReaderExtensions.GetValueOrDefault<Boolean>("MiddlewareLogging", "LogRequests", true);
81+
bool logResponses = ConfigurationReaderExtensions.GetValueOrDefault<Boolean>("MiddlewareLogging", "LogResponses", true);
82+
LogLevel middlewareLogLevel = ConfigurationReaderExtensions.GetValueOrDefault<LogLevel>("MiddlewareLogging", "MiddlewareLogLevel", LogLevel.Warning);
83+
84+
RequestResponseMiddlewareLoggingConfig config =
85+
new RequestResponseMiddlewareLoggingConfig(middlewareLogLevel, logRequests, logResponses);
86+
87+
this.AddSingleton(config);
88+
}
89+
}
90+
91+
public static class ConfigurationReaderExtensions
92+
{
93+
public static T GetValueOrDefault<T>(String sectionName, String keyName, T defaultValue)
94+
{
95+
try
96+
{
97+
var value = ConfigurationReader.GetValue(sectionName, keyName);
98+
99+
if (String.IsNullOrEmpty(value))
100+
{
101+
return defaultValue;
102+
}
103+
104+
return (T)Convert.ChangeType(value, typeof(T));
105+
}
106+
catch (KeyNotFoundException kex)
107+
{
108+
return defaultValue;
109+
}
74110
}
75111
}
76112
}

‎CallbackHandler/Bootstrapper/RepositoryRegistry.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@ public RepositoryRegistry()
2828
this.AddEventStorePersistentSubscriptionsClient(connectionString);
2929

3030
this.AddEventStoreClient(connectionString);
31+
32+
this.AddSingleton<IDomainEventFactory<IDomainEvent>, DomainEventFactory>();
3133
}
3234
}

‎CallbackHandler/CallbackHandler.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.0" />
1313
<PackageReference Include="MediatR" Version="12.2.0" />
1414
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
15-
<PackageReference Include="Shared" Version="2024.4.1" />
15+
<PackageReference Include="Shared" Version="2024.7.1" />
1616
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
1717
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
1818
<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.1" />

‎CallbackHandler/Startup.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,11 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
9696

9797
if (env.IsDevelopment())
9898
{
99-
nlogConfigFilename = $"nlog.{env.EnvironmentName}.config";
99+
var developmentNlogConfigFilename = "nlog.development.config";
100+
if (File.Exists(Path.Combine(env.ContentRootPath, developmentNlogConfigFilename)))
101+
{
102+
nlogConfigFilename = developmentNlogConfigFilename;
103+
}
100104
app.UseDeveloperExceptionPage();
101105
}
102106

@@ -106,12 +110,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
106110
ILogger logger = loggerFactory.CreateLogger("CallbackHandler");
107111

108112
Logger.Initialise(logger);
109-
110-
Action<String> loggerAction = message =>
111-
{
112-
Logger.LogInformation(message);
113-
};
114-
Startup.Configuration.LogConfiguration(loggerAction);
113+
Startup.Configuration.LogConfiguration(Logger.LogWarning);
115114

116115
ConfigurationReader.Initialise(Startup.Configuration);
117116

‎CallbackHandler/nlog.config‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,24 @@
2222

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

0 commit comments

Comments
 (0)