Skip to content

Commit 24b660f

Browse files
committed
Expore Program.AppName/AppShortName for logging
1 parent 8de902c commit 24b660f

4 files changed

Lines changed: 19 additions & 17 deletions

File tree

src/Services/Basket/Basket.API/Program.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
1212
{
1313
public class Program
1414
{
15-
private static readonly string ApplicationName = typeof(Program).Namespace;
15+
public static readonly string AppName = typeof(Program).Namespace;
16+
public static readonly string ShortAppName = AppName.Substring(AppName.LastIndexOf('.', AppName.LastIndexOf('.') - 1) + 1);
1617

1718
public static int Main(string[] args)
1819
{
@@ -22,17 +23,17 @@ public static int Main(string[] args)
2223

2324
try
2425
{
25-
Log.Information("Configuring web host ({Application})...", ApplicationName);
26+
Log.Information("Configuring web host ({Application})...", AppName);
2627
var host = BuildWebHost(configuration, args);
2728

28-
Log.Information("Starting web host ({Application})...", ApplicationName);
29+
Log.Information("Starting web host ({Application})...", AppName);
2930
host.Run();
3031

3132
return 0;
3233
}
3334
catch (Exception ex)
3435
{
35-
Log.Fatal(ex, "Program terminated unexpectedly ({Application})!", ApplicationName);
36+
Log.Fatal(ex, "Program terminated unexpectedly ({Application})!", AppName);
3637
return 1;
3738
}
3839
finally
@@ -59,7 +60,7 @@ private static Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
5960

6061
return new LoggerConfiguration()
6162
.MinimumLevel.Verbose()
62-
.Enrich.WithProperty("Application", ApplicationName)
63+
.Enrich.WithProperty("Application", AppName)
6364
.Enrich.FromLogContext()
6465
.WriteTo.Console()
6566
.WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)

src/Services/Basket/Basket.API/Startup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
181181
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
182182
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
183183
{
184-
loggerFactory.AddAzureWebAppDiagnostics();
185-
loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
184+
//loggerFactory.AddAzureWebAppDiagnostics();
185+
//loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
186186

187187
var pathBase = Configuration["PATH_BASE"];
188188
if (!string.IsNullOrEmpty(pathBase))

src/Services/Catalog/Catalog.API/Program.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
1414
{
1515
public class Program
1616
{
17-
private static readonly string ApplicationName = typeof(Program).Namespace;
17+
public static readonly string AppName = typeof(Program).Namespace;
18+
public static readonly string ShortAppName = AppName.Substring(AppName.LastIndexOf('.', AppName.LastIndexOf('.') - 1) + 1);
1819

1920
public static int Main(string[] args)
2021
{
@@ -24,30 +25,30 @@ public static int Main(string[] args)
2425

2526
try
2627
{
27-
Log.Information("Configuring web host ({Application})...", ApplicationName);
28+
Log.Information("Configuring web host ({Application})...", AppName);
2829
var host = BuildWebHost(configuration, args);
2930

30-
Log.Information("Applying migrations ({Application})...", ApplicationName);
31+
Log.Information("Applying migrations ({Application})...", AppName);
3132
host.MigrateDbContext<CatalogContext>((context, services) =>
3233
{
3334
var env = services.GetService<IHostingEnvironment>();
3435
var settings = services.GetService<IOptions<CatalogSettings>>();
3536
var logger = services.GetService<ILogger<CatalogContextSeed>>();
3637

3738
new CatalogContextSeed()
38-
.SeedAsync(context, env, settings, logger)
39-
.Wait();
39+
.SeedAsync(context, env, settings, logger)
40+
.Wait();
4041
})
4142
.MigrateDbContext<IntegrationEventLogContext>((_, __) => { });
4243

43-
Log.Information("Starting web host ({Application})...", ApplicationName);
44+
Log.Information("Starting web host ({Application})...", AppName);
4445
host.Run();
4546

4647
return 0;
4748
}
4849
catch (Exception ex)
4950
{
50-
Log.Fatal(ex, "Program terminated unexpectedly ({Application})!", ApplicationName);
51+
Log.Fatal(ex, "Program terminated unexpectedly ({Application})!", AppName);
5152
return 1;
5253
}
5354
finally
@@ -73,7 +74,7 @@ private static Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
7374

7475
return new LoggerConfiguration()
7576
.MinimumLevel.Verbose()
76-
.Enrich.WithProperty("Application", ApplicationName)
77+
.Enrich.WithProperty("Application", AppName)
7778
.Enrich.FromLogContext()
7879
.WriteTo.Console()
7980
.WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)

src/Services/Catalog/Catalog.API/Startup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
6464
{
6565
//Configure logs
6666

67-
loggerFactory.AddAzureWebAppDiagnostics();
68-
loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
67+
//loggerFactory.AddAzureWebAppDiagnostics();
68+
//loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
6969

7070
var pathBase = Configuration["PATH_BASE"];
7171

0 commit comments

Comments
 (0)