Skip to content

Commit 2d0aeaa

Browse files
AntonioFalcaoJrAntonioFalcaoJr
committed
Adding Serilog
1 parent 841f078 commit 2d0aeaa

2 files changed

Lines changed: 64 additions & 67 deletions

File tree

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

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -39,47 +39,44 @@ public void Configure(IApplicationBuilder app)
3939
if (_env.IsDevelopment())
4040
app.UseDeveloperExceptionPage();
4141

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

44-
app.UseApplicationGraphQL<StoreSchema>();
45-
46-
app.UseRouting()
47-
.UseEndpoints(endpoints =>
48-
{
49-
endpoints.MapControllers();
50+
endpoints.MapDumpConfig(
51+
pattern: "/dump-config",
52+
configInfo: (_configuration as IConfigurationRoot).GetDebugView(),
53+
isDevelopment: _env.IsDevelopment());
5054

51-
endpoints.MapDumpConfig(
52-
pattern: "/dump-config",
53-
configInfo: (_configuration as IConfigurationRoot).GetDebugView(),
54-
isDevelopment: _env.IsDevelopment());
55-
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)));
55+
endpoints.MapApplicationHealthChecks(
56+
pattern: _configuration["HealthChecksPatterns:Health"],
57+
predicate: registration
58+
=> registration.Tags.Any() is false);
7259

73-
endpoints.MapHealthChecks(
74-
pattern: _configuration["HealthChecksPatterns:UI"],
75-
options: new() {ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse});
76-
});
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+
});
7776
}
7877

7978
public void ConfigureServices(IServiceCollection services)
8079
{
81-
services.AddControllers();
82-
8380
services
8481
.AddBuilders()
8582
.AddRepositories()
@@ -88,7 +85,8 @@ public void ConfigureServices(IServiceCollection services)
8885
.AddApplicationServices()
8986
.AddApplicationMessageServices()
9087
.AddApplicationSubjects()
91-
.AddApplicationAutoMapper();
88+
.AddApplicationAutoMapper()
89+
.AddControllers();
9290

9391
services.AddApplicationDbContext(options =>
9492
{

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

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -41,41 +41,40 @@ public void Configure(IApplicationBuilder app)
4141
app.UseHsts();
4242
}
4343

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

48-
app.UseEndpoints(endpoints =>
49-
{
50-
endpoints.MapControllerRoute("default",
51-
"{controller=Home}/{action=Index}/{id?}");
52-
53-
endpoints.MapDumpConfig(
54-
pattern: "/dump-config",
55-
configInfo: (_configuration as IConfigurationRoot).GetDebugView(),
56-
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)));
5767

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

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

8180
public void ConfigureServices(IServiceCollection services)

0 commit comments

Comments
 (0)