Skip to content

Commit 7844287

Browse files
Merge pull request #180 from AntonioFalcao/feature/graphql-4
Adding serilog
2 parents 49277c6 + 31a37e8 commit 7844287

2 files changed

Lines changed: 67 additions & 65 deletions

File tree

src/Dotnet6.GraphQL4.Store.WebAPI/Startup.cs

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using Microsoft.Extensions.DependencyInjection;
1818
using Microsoft.Extensions.Diagnostics.HealthChecks;
1919
using Microsoft.Extensions.Hosting;
20+
using Serilog;
2021

2122
namespace Dotnet6.GraphQL4.Store.WebAPI
2223
{
@@ -37,46 +38,45 @@ public void Configure(IApplicationBuilder app)
3738
{
3839
if (_env.IsDevelopment())
3940
app.UseDeveloperExceptionPage();
40-
41-
app.UseApplicationGraphQL<StoreSchema>();
4241

43-
app.UseRouting()
44-
.UseEndpoints(endpoints =>
45-
{
46-
endpoints.MapControllers();
42+
app.UseSerilogRequestLogging()
43+
.UseApplicationGraphQL<StoreSchema>()
44+
.UseRouting()
45+
.UseEndpoints(
46+
endpoints =>
47+
{
48+
endpoints.MapControllers();
4749

48-
endpoints.MapDumpConfig(
49-
pattern: "/dump-config",
50-
configInfo: (_configuration as IConfigurationRoot).GetDebugView(),
51-
isDevelopment: _env.IsDevelopment());
52-
53-
endpoints.MapApplicationHealthChecks(
54-
pattern: _configuration["HealthChecksPatterns:Health"],
55-
predicate: registration
56-
=> registration.Tags.Any() is false);
57-
58-
endpoints.MapApplicationHealthChecks(
59-
pattern: _configuration["HealthChecksPatterns:Liveness"],
60-
predicate: registration
61-
=> registration.Tags.Any(item
62-
=> _livenessTags.Contains(item)));
63-
64-
endpoints.MapApplicationHealthChecks(
65-
pattern: _configuration["HealthChecksPatterns:Readiness"],
66-
predicate: registration
67-
=> registration.Tags.Any(item
68-
=> _readinessTags.Contains(item)));
50+
endpoints.MapDumpConfig(
51+
pattern: "/dump-config",
52+
configInfo: (_configuration as IConfigurationRoot).GetDebugView(),
53+
isDevelopment: _env.IsDevelopment());
6954

70-
endpoints.MapHealthChecks(
71-
pattern: _configuration["HealthChecksPatterns:UI"],
72-
options: new() {ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse});
73-
});
55+
endpoints.MapApplicationHealthChecks(
56+
pattern: _configuration["HealthChecksPatterns:Health"],
57+
predicate: registration
58+
=> registration.Tags.Any() is false);
59+
60+
endpoints.MapApplicationHealthChecks(
61+
pattern: _configuration["HealthChecksPatterns:Liveness"],
62+
predicate: registration
63+
=> registration.Tags.Any(item
64+
=> _livenessTags.Contains(item)));
65+
66+
endpoints.MapApplicationHealthChecks(
67+
pattern: _configuration["HealthChecksPatterns:Readiness"],
68+
predicate: registration
69+
=> registration.Tags.Any(item
70+
=> _readinessTags.Contains(item)));
71+
72+
endpoints.MapHealthChecks(
73+
pattern: _configuration["HealthChecksPatterns:UI"],
74+
options: new() {ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse});
75+
});
7476
}
7577

7678
public void ConfigureServices(IServiceCollection services)
7779
{
78-
services.AddControllers();
79-
8080
services
8181
.AddBuilders()
8282
.AddRepositories()
@@ -85,7 +85,8 @@ public void ConfigureServices(IServiceCollection services)
8585
.AddApplicationServices()
8686
.AddApplicationMessageServices()
8787
.AddApplicationSubjects()
88-
.AddApplicationAutoMapper();
88+
.AddApplicationAutoMapper()
89+
.AddControllers();
8990

9091
services.AddApplicationDbContext(options =>
9192
{

src/Dotnet6.GraphQL4.Store.WebMVC/Startup.cs

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
using Microsoft.Extensions.DependencyInjection;
1313
using Microsoft.Extensions.Diagnostics.HealthChecks;
1414
using Microsoft.Extensions.Hosting;
15+
using Serilog;
1516

1617
namespace Dotnet6.GraphQL4.Store.WebMVC
1718
{
@@ -40,40 +41,40 @@ public void Configure(IApplicationBuilder app)
4041
app.UseHsts();
4142
}
4243

43-
app.UseStaticFiles();
44-
app.UseRouting();
44+
app.UseStaticFiles()
45+
.UseSerilogRequestLogging()
46+
.UseRouting()
47+
.UseEndpoints(
48+
endpoints =>
49+
{
50+
endpoints.MapControllerRoute("default", "{controller=Home}/{action=Index}/{id?}");
4551

46-
app.UseEndpoints(endpoints =>
47-
{
48-
endpoints.MapControllerRoute("default",
49-
"{controller=Home}/{action=Index}/{id?}");
50-
51-
endpoints.MapDumpConfig(
52-
pattern: "/dump-config",
53-
configInfo: (_configuration as IConfigurationRoot).GetDebugView(),
54-
isDevelopment: _env.IsDevelopment());
52+
endpoints.MapDumpConfig(
53+
pattern: "/dump-config",
54+
configInfo: (_configuration as IConfigurationRoot).GetDebugView(),
55+
isDevelopment: _env.IsDevelopment());
56+
57+
endpoints.MapApplicationHealthChecks(
58+
pattern: _configuration["HealthChecksPatterns:Health"],
59+
predicate: registration
60+
=> registration.Tags.Any() is false);
61+
62+
endpoints.MapApplicationHealthChecks(
63+
pattern: _configuration["HealthChecksPatterns:Liveness"],
64+
predicate: registration
65+
=> registration.Tags.Any(item
66+
=> _livenessTags.Contains(item)));
5567

56-
endpoints.MapApplicationHealthChecks(
57-
pattern: _configuration["HealthChecksPatterns:Health"],
58-
predicate: registration
59-
=> registration.Tags.Any() is false);
60-
61-
endpoints.MapApplicationHealthChecks(
62-
pattern: _configuration["HealthChecksPatterns:Liveness"],
63-
predicate: registration
64-
=> registration.Tags.Any(item
65-
=> _livenessTags.Contains(item)));
66-
67-
endpoints.MapApplicationHealthChecks(
68-
pattern: _configuration["HealthChecksPatterns:Readiness"],
69-
predicate: registration
70-
=> registration.Tags.Any(item
71-
=> _readinessTags.Contains(item)));
68+
endpoints.MapApplicationHealthChecks(
69+
pattern: _configuration["HealthChecksPatterns:Readiness"],
70+
predicate: registration
71+
=> registration.Tags.Any(item
72+
=> _readinessTags.Contains(item)));
7273

73-
endpoints.MapHealthChecks(
74-
pattern: _configuration["HealthChecksPatterns:UI"],
75-
options: new() {ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse});
76-
});
74+
endpoints.MapHealthChecks(
75+
pattern: _configuration["HealthChecksPatterns:UI"],
76+
options: new() {ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse});
77+
});
7778
}
7879

7980
public void ConfigureServices(IServiceCollection services)

0 commit comments

Comments
 (0)