Skip to content

Commit 858b16e

Browse files
StuartFergusonStuartFerguson
authored
Merge pull request #144 from TransactionProcessing/task/#141_fixhealthchecks
Task/#141 fixhealthchecks
2 parents ba8f082 + 9e588fe commit 858b16e

7 files changed

Lines changed: 30 additions & 14 deletions

File tree

‎SecurityService.BusinessLogic/SecurityService.BusinessLogic.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.2.0" />
1111
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.12" />
1212
<PackageReference Include="Microsoft.Extensions.Identity.Core" Version="5.0.12" />
13-
<PackageReference Include="Shared" Version="1.1.4" />
13+
<PackageReference Include="Shared" Version="1.1.5" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎SecurityService.Client/SecurityService.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.4" />
9+
<PackageReference Include="ClientProxyBase" Version="1.1.5" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎SecurityService.Database/SecurityService.Database.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
</PackageReference>
2121
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.3" />
22-
<PackageReference Include="Shared" Version="1.1.4" />
22+
<PackageReference Include="Shared" Version="1.1.5" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<Folder Include="DbContexts\" />

‎SecurityService.OpenIdConnect.IntegrationTests/SecurityService.OpenIdConnect.IntegrationTests.csproj‎

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

1313
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
1414
<PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
15-
<PackageReference Include="Shared.IntegrationTesting" Version="1.1.0" />
15+
<PackageReference Include="Shared.IntegrationTesting" Version="1.1.5" />
1616
<PackageReference Include="xunit" Version="2.4.1" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1818
<PrivateAssets>all</PrivateAssets>

‎SecurityService/Startup.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ public void Configure(IApplicationBuilder app,
222222
String nlogConfigFilename = "nlog.config";
223223
if (env.IsDevelopment())
224224
{
225-
nlogConfigFilename = $"nlog.{env.EnvironmentName}.config";
226225
app.UseDeveloperExceptionPage();
227226
}
228227

‎SecurityService/appsettings.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"IssuerUrl": "https://127.0.0.1:5001"
55
},
66
"ConnectionStrings": {
7-
"PersistedGrantDbContext": "server=127.0.0.1;database=PersistedGrantStore;user id=sa;password=sp1ttal",
8-
"ConfigurationDbContext": "server=127.0.0.1;database=Configuration;user id=sa;password=sp1ttal",
9-
"AuthenticationDbContext": "server=127.0.0.1;database=Authentication;user id=sa;password=sp1ttal"
7+
"PersistedGrantDbContext": "server=127.0.0.1;database=PersistedGrantStore;user id=sa;password=Sc0tland",
8+
"ConfigurationDbContext": "server=127.0.0.1;database=Configuration;user id=sa;password=Sc0tland",
9+
"AuthenticationDbContext": "server=127.0.0.1;database=Authentication;user id=sa;password=Sc0tland"
1010
},
1111
"AppSettings": {
1212
"DatabaseEngine": "SqlServer"

‎SecurityService/nlog.config‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,15 @@
44
<targets>
55
<target name="asyncFile" xsi:type="AsyncWrapper">
66
<target name="logfile" xsi:type="File"
7-
fileName="/home/txnproc/trace/SecurityService.log"
7+
fileName="/home/txnproc/trace/securityservice.log"
8+
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= | }"
9+
archiveNumbering="Date"
10+
archiveDateFormat="yyyyMMdd-HH"
11+
archiveEvery="Hour"
12+
keepFileOpen="false"
13+
maxArchiveFiles="24"/>
14+
<target name="healthlogfile" xsi:type="File"
15+
fileName="/home/txnproc/trace/securityservice_health.log"
816
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= | }"
917
archiveNumbering="Date"
1018
archiveDateFormat="yyyyMMdd-HH"
@@ -17,9 +25,18 @@
1725
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= | }"
1826
detectConsoleAvailable="true" />
1927
</targets>
20-
21-
<rules>
22-
<logger name="*" minlevel="Trace" writeTo="logfile"/>
23-
<!--<logger name="*" minlevel="Trace" writeTo="console"/>-->
24-
</rules>
28+
29+
<rules>
30+
<logger name="Microsoft.*" minlevel="Debug" writeTo="" final="true" />
31+
<logger name="*" minlevel="Debug" writeTo="logfile">
32+
<filters defaultAction="Log">
33+
<when condition="contains('${message}', 'HEALTH_CHECK')" action="Ignore"></when>
34+
</filters>
35+
</logger>
36+
<logger name="*" minlevel="Debug" writeTo="healthlogfile">
37+
<filters defaultAction="Ignore">
38+
<when condition="contains('${message}', 'HEALTH_CHECK')" action="Log"></when>
39+
</filters>
40+
</logger>
41+
</rules>
2542
</nlog>

0 commit comments

Comments
 (0)