Skip to content

Commit da72fc8

Browse files
mvelosopmvelosop
committed
Revert "Add Seq to ApiGatewayAggregators"
This reverts commit 21427eb.
1 parent 122fab5 commit da72fc8

6 files changed

Lines changed: 74 additions & 153 deletions

File tree

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.0" />
1717
<PackageReference Include="Microsoft.AspNetCore.App" />
1818
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
19+
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="2.2.0" />
1920
<PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
20-
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.2" />
21-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.0.1" />
2221
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
23-
<PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
2422
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
2523
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0-preview3-35497" />
2624
</ItemGroup>

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/Program.cs‎

Lines changed: 30 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,44 @@
1-
using Microsoft.AspNetCore;
1+
using System;
2+
using System.Collections.Generic;
3+
using System.IO;
4+
using System.Linq;
5+
using System.Threading.Tasks;
6+
using Microsoft.AspNetCore;
27
using Microsoft.AspNetCore.Hosting;
38
using Microsoft.Extensions.Configuration;
4-
using Microsoft.Extensions.Configuration.Json;
9+
using Microsoft.Extensions.Logging;
510
using Serilog;
6-
using System;
7-
using System.IO;
811

912
namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
1013
{
1114
public class Program
1215
{
13-
public static readonly string AppName = typeof(Program).Namespace;
14-
public static readonly string ShortAppName = AppName.Substring(AppName.LastIndexOf('.', AppName.LastIndexOf('.') - 1) + 1);
15-
16-
public static int Main(string[] args)
16+
public static void Main(string[] args)
1717
{
18-
var configuration = GetConfiguration();
19-
20-
Log.Logger = CreateSerilogLogger(configuration);
21-
22-
try
23-
{
24-
Log.Information("Configuring web host ({Application})...", AppName);
25-
var host = BuildWebHost(configuration, args);
26-
27-
Log.Information("Starting web host ({Application})...", AppName);
28-
host.Run();
29-
30-
return 0;
31-
}
32-
catch (Exception ex)
33-
{
34-
Log.Fatal(ex, "Program terminated unexpectedly ({Application})!", AppName);
35-
return 1;
36-
}
37-
finally
38-
{
39-
Log.CloseAndFlush();
40-
}
18+
BuildWebHost(args).Run();
4119
}
4220

43-
private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
44-
WebHost.CreateDefaultBuilder(args)
45-
.CaptureStartupErrors(false)
21+
public static IWebHost BuildWebHost(string[] args) =>
22+
WebHost
23+
.CreateDefaultBuilder(args)
24+
.ConfigureAppConfiguration(cb =>
25+
{
26+
var sources = cb.Sources;
27+
sources.Insert(3, new Microsoft.Extensions.Configuration.Json.JsonConfigurationSource()
28+
{
29+
Optional = true,
30+
Path = "appsettings.localhost.json",
31+
ReloadOnChange = false
32+
});
33+
})
4634
.UseStartup<Startup>()
47-
.UseSerilog()
35+
.UseSerilog((builderContext, config) =>
36+
{
37+
config
38+
.MinimumLevel.Information()
39+
.Enrich.FromLogContext()
40+
.WriteTo.Console();
41+
})
4842
.Build();
49-
50-
private static Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
51-
{
52-
var seqServerUrl = configuration["Serilog:SeqServerUrl"];
53-
54-
return new LoggerConfiguration()
55-
.MinimumLevel.Verbose()
56-
.Enrich.WithProperty("Application", AppName)
57-
.Enrich.FromLogContext()
58-
.WriteTo.Console()
59-
.WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
60-
.ReadFrom.Configuration(configuration)
61-
.CreateLogger();
62-
}
63-
64-
private static IConfiguration GetConfiguration()
65-
{
66-
var builder = new ConfigurationBuilder()
67-
.SetBasePath(Directory.GetCurrentDirectory())
68-
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
69-
.AddEnvironmentVariables();
70-
71-
builder.Sources.Insert(3, new JsonConfigurationSource()
72-
{
73-
Optional = true,
74-
Path = "appsettings.localhost.json",
75-
ReloadOnChange = false
76-
});
77-
78-
return builder.Build();
79-
}
8043
}
81-
}
44+
}

‎src/ApiGateways/Mobile.Bff.Shopping/aggregator/appsettings.json‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{
2-
"Serilog": {
3-
"SeqServerUrl": null,
4-
"MinimumLevel": {
5-
"Default": "Information",
6-
"Override": {
7-
"Microsoft": "Warning",
8-
"Microsoft.eShopOnContainers": "Information",
9-
"System": "Warning"
2+
"Logging": {
3+
"IncludeScopes": false,
4+
"Debug": {
5+
"LogLevel": {
6+
"Default": "Warning"
7+
}
8+
},
9+
"Console": {
10+
"LogLevel": {
11+
"Default": "Warning"
1012
}
1113
}
1214
}

‎src/ApiGateways/Web.Bff.Shopping/aggregator/Program.cs‎

Lines changed: 22 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -6,80 +6,39 @@
66
using Microsoft.AspNetCore;
77
using Microsoft.AspNetCore.Hosting;
88
using Microsoft.Extensions.Configuration;
9-
using Microsoft.Extensions.Configuration.Json;
109
using Microsoft.Extensions.Logging;
1110
using Serilog;
1211

1312
namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
1413
{
1514
public class Program
1615
{
17-
public static readonly string AppName = typeof(Program).Namespace;
18-
public static readonly string ShortAppName = AppName.Substring(AppName.LastIndexOf('.', AppName.LastIndexOf('.') - 1) + 1);
19-
20-
public static int Main(string[] args)
16+
public static void Main(string[] args)
2117
{
22-
var configuration = GetConfiguration();
23-
24-
Log.Logger = CreateSerilogLogger(configuration);
25-
26-
try
27-
{
28-
Log.Information("Configuring web host ({Application})...", AppName);
29-
var host = BuildWebHost(configuration, args);
30-
31-
Log.Information("Starting web host ({Application})...", AppName);
32-
host.Run();
33-
34-
return 0;
35-
}
36-
catch (Exception ex)
37-
{
38-
Log.Fatal(ex, "Program terminated unexpectedly ({Application})!", AppName);
39-
return 1;
40-
}
41-
finally
42-
{
43-
Log.CloseAndFlush();
44-
}
18+
BuildWebHost(args).Run();
4519
}
4620

47-
private static IWebHost BuildWebHost(IConfiguration configuration, string[] args) =>
48-
WebHost.CreateDefaultBuilder(args)
49-
.CaptureStartupErrors(false)
21+
public static IWebHost BuildWebHost(string[] args) =>
22+
WebHost
23+
.CreateDefaultBuilder(args)
24+
.ConfigureAppConfiguration(cb =>
25+
{
26+
var sources = cb.Sources;
27+
sources.Insert(3, new Microsoft.Extensions.Configuration.Json.JsonConfigurationSource()
28+
{
29+
Optional = true,
30+
Path = "appsettings.localhost.json",
31+
ReloadOnChange = false
32+
});
33+
})
5034
.UseStartup<Startup>()
51-
.UseSerilog()
35+
.UseSerilog((builderContext, config) =>
36+
{
37+
config
38+
.MinimumLevel.Information()
39+
.Enrich.FromLogContext()
40+
.WriteTo.Console();
41+
})
5242
.Build();
53-
54-
private static Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
55-
{
56-
var seqServerUrl = configuration["Serilog:SeqServerUrl"];
57-
58-
return new LoggerConfiguration()
59-
.MinimumLevel.Verbose()
60-
.Enrich.WithProperty("Application", AppName)
61-
.Enrich.FromLogContext()
62-
.WriteTo.Console()
63-
.WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
64-
.ReadFrom.Configuration(configuration)
65-
.CreateLogger();
66-
}
67-
68-
private static IConfiguration GetConfiguration()
69-
{
70-
var builder = new ConfigurationBuilder()
71-
.SetBasePath(Directory.GetCurrentDirectory())
72-
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
73-
.AddEnvironmentVariables();
74-
75-
builder.Sources.Insert(3, new JsonConfigurationSource()
76-
{
77-
Optional = true,
78-
Path = "appsettings.localhost.json",
79-
ReloadOnChange = false
80-
});
81-
82-
return builder.Build();
83-
}
8443
}
8544
}

‎src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@
1414
<ItemGroup>
1515
<PackageReference Include="AspNetCore.HealthChecks.Uris" Version="2.2.0" />
1616
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="2.2.0" />
17-
<PackageReference Include="Microsoft.AspNetCore.App" />
17+
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
1818
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.HealthChecks" Version="2.2.0" />
1919
<PackageReference Include="Serilog.AspNetCore" Version="2.1.1" />
20-
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.1.2" />
21-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.0.1" />
2220
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
23-
<PackageReference Include="Serilog.Sinks.Seq" Version="4.0.0" />
2421
<PackageReference Include="Swashbuckle.AspNetCore" Version="3.0.0" />
2522
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.2.0-preview3-35497" />
2623
</ItemGroup>

‎src/ApiGateways/Web.Bff.Shopping/aggregator/appsettings.json‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{
2-
"Serilog": {
3-
"SeqServerUrl": null,
4-
"MinimumLevel": {
5-
"Default": "Information",
6-
"Override": {
7-
"Microsoft": "Warning",
8-
"Microsoft.eShopOnContainers": "Information",
9-
"System": "Warning"
2+
"Logging": {
3+
"IncludeScopes": false,
4+
"Debug": {
5+
"LogLevel": {
6+
"Default": "Warning"
7+
}
8+
},
9+
"Console": {
10+
"LogLevel": {
11+
"Default": "Warning"
1012
}
1113
}
1214
}

0 commit comments

Comments
 (0)