Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit 7d06508

Browse files
authored
Merge pull request #2089 from erjain/update/ordering-webappbuilder
Update/ordering webappbuilder
2 parents b9e585b + ce5a165 commit 7d06508

File tree

10 files changed

+311
-495
lines changed

10 files changed

+311
-495
lines changed
File renamed without changes.

src/Services/Ordering/Ordering.API/Ordering.API.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,4 @@
7676
</None>
7777
</ItemGroup>
7878

79-
<ItemGroup>
80-
<None Include="\.editorconfig" />
81-
</ItemGroup>
82-
8379
</Project>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
global using Autofac.Extensions.DependencyInjection;
2+
global using Microsoft.AspNetCore.Hosting;
3+
global using Microsoft.Extensions.Configuration;
4+
global using Microsoft.Extensions.Hosting;
5+
global using Ordering.BackgroundTasks.Extensions;
6+
global using Serilog;
7+
global using System.IO;
8+
global using HealthChecks.UI.Client;
9+
global using Microsoft.AspNetCore.Builder;
10+
global using Microsoft.AspNetCore.Diagnostics.HealthChecks;
11+
global using Microsoft.Extensions.Configuration;
12+
global using Microsoft.Extensions.DependencyInjection;
13+
global using Microsoft.Extensions.Logging;
14+
global using Ordering.BackgroundTasks.Extensions;
15+
global using Ordering.BackgroundTasks.Services;
16+
global using System;
17+
global using Ordering.BackgroundTasks;
Lines changed: 69 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,74 @@
1-
using Autofac.Extensions.DependencyInjection;
2-
using Microsoft.AspNetCore.Hosting;
3-
using Microsoft.Extensions.Configuration;
4-
using Microsoft.Extensions.Hosting;
5-
using Ordering.BackgroundTasks.Extensions;
6-
using Serilog;
7-
using System.IO;
1+
var appName = "Ordering.BackgroundTasks";
2+
var builder = WebApplication.CreateBuilder(new WebApplicationOptions
3+
{
4+
Args = args,
5+
ApplicationName = typeof(Program).Assembly.FullName
6+
});
7+
builder.Configuration.SetBasePath(Directory.GetCurrentDirectory());
8+
builder.Configuration.AddJsonFile("appsettings.json", optional: true);
9+
builder.Configuration.AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true);
10+
builder.Configuration.AddEnvironmentVariables();
11+
builder.Host.UseSerilog(CreateSerilogLogger(builder.Configuration));
12+
builder.Services.AddCustomHealthCheck(builder.Configuration)
13+
.Configure<BackgroundTaskSettings>(builder.Configuration)
14+
.AddOptions()
15+
.AddHostedService<GracePeriodManagerService>()
16+
.AddEventBus(builder.Configuration);
17+
var app = builder.Build();
18+
if (app.Environment.IsDevelopment())
19+
{
20+
app.UseDeveloperExceptionPage();
21+
}
22+
else
23+
{
24+
app.UseExceptionHandler("/Home/Error");
25+
}
26+
app.UseRouting();
827

9-
namespace Ordering.BackgroundTasks
28+
app.MapHealthChecks("/hc", new HealthCheckOptions()
1029
{
11-
public class Program
12-
{
13-
public static readonly string AppName = typeof(Program).Assembly.GetName().Name;
30+
Predicate = _ => true,
31+
ResponseWriter = UIResponseWriter.WriteHealthCheckUIResponse
32+
});
33+
app.MapHealthChecks("/liveness", new HealthCheckOptions
34+
{
35+
Predicate = r => r.Name.Contains("self")
36+
});
1437

15-
public static void Main(string[] args)
16-
{
17-
CreateHostBuilder(args).Run();
18-
}
38+
try
39+
{
40+
Log.Information("Starting web host ({ApplicationContext})...", Program.AppName);
41+
await app.RunAsync();
1942

20-
public static IHost CreateHostBuilder(string[] args) =>
21-
Host.CreateDefaultBuilder(args)
22-
.UseServiceProviderFactory(new AutofacServiceProviderFactory())
23-
.ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>())
24-
.ConfigureAppConfiguration((host, builder) =>
25-
{
26-
builder.SetBasePath(Directory.GetCurrentDirectory());
27-
builder.AddJsonFile("appsettings.json", optional: true);
28-
builder.AddJsonFile($"appsettings.{host.HostingEnvironment.EnvironmentName}.json", optional: true);
29-
builder.AddEnvironmentVariables();
30-
builder.AddCommandLine(args);
31-
})
32-
.ConfigureLogging((host, builder) => builder.UseSerilog(host.Configuration).AddSerilog())
33-
.Build();
34-
}
43+
return 0;
44+
}
45+
catch (Exception ex)
46+
{
47+
Log.Fatal(ex, "Program terminated unexpectedly ({ApplicationContext})!", Program.AppName);
48+
return 1;
49+
}
50+
finally
51+
{
52+
Log.CloseAndFlush();
53+
}
54+
55+
Serilog.ILogger CreateSerilogLogger(IConfiguration configuration)
56+
{
57+
var seqServerUrl = configuration["Serilog:SeqServerUrl"];
58+
var logstashUrl = configuration["Serilog:LogstashgUrl"];
59+
return new LoggerConfiguration()
60+
.MinimumLevel.Verbose()
61+
.Enrich.WithProperty("ApplicationContext", Program.AppName)
62+
.Enrich.FromLogContext()
63+
.WriteTo.Console()
64+
.WriteTo.Seq(string.IsNullOrWhiteSpace(seqServerUrl) ? "http://seq" : seqServerUrl)
65+
.WriteTo.Http(string.IsNullOrWhiteSpace(logstashUrl) ? "http://logstash:8080" : logstashUrl, null)
66+
.ReadFrom.Configuration(configuration)
67+
.CreateLogger();
68+
}
69+
70+
public partial class Program
71+
{
72+
public static string Namespace = typeof(Program).Assembly.GetName().Name;
73+
public static string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
3574
}

src/Services/Ordering/Ordering.BackgroundTasks/Startup.cs

Lines changed: 0 additions & 48 deletions
This file was deleted.

src/Services/Ordering/Ordering.SignalrHub/GlobalUsings.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@
3030
global using System.Reflection;
3131
global using System.Threading.Tasks;
3232
global using System;
33+
global using Microsoft.Extensions.Hosting;

0 commit comments

Comments
 (0)