From 5397e8d5c8dc9d08880e185e92c948776953d15f Mon Sep 17 00:00:00 2001
From: David Fowler <davidfowl@gmail.com>
Date: Thu, 4 May 2023 16:23:24 -0700
Subject: [PATCH] Made small tweak to startup

---
 src/Services/Basket/Basket.API/Program.cs     | 32 +++++++------------
 src/Services/Catalog/Catalog.API/Program.cs   |  7 +++-
 .../Catalog/Catalog.API/appsettings.json      | 20 ++++++++----
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs
index 9c11243e6..06d354f06 100644
--- a/src/Services/Basket/Basket.API/Program.cs
+++ b/src/Services/Basket/Basket.API/Program.cs
@@ -16,31 +16,21 @@ builder.Services.AddTransient<IIdentityService, IdentityService>();
 
 var app = builder.Build();
 
-try
+if (!await app.CheckHealthAsync())
 {
-    if (!await app.CheckHealthAsync())
-    {
-        return 1;
-    }
-
-    app.UseServiceDefaults();
+    return;
+}
 
-    app.MapGet("/", () => Results.Redirect("/swagger"));
+app.UseServiceDefaults();
 
-    app.MapGrpcService<BasketService>();
-    app.MapControllers();
+app.MapGet("/", () => Results.Redirect("/swagger"));
 
-    var eventBus = app.Services.GetRequiredService<IEventBus>();
+app.MapGrpcService<BasketService>();
+app.MapControllers();
 
-    eventBus.Subscribe<ProductPriceChangedIntegrationEvent, ProductPriceChangedIntegrationEventHandler>();
-    eventBus.Subscribe<OrderStartedIntegrationEvent, OrderStartedIntegrationEventHandler>();
+var eventBus = app.Services.GetRequiredService<IEventBus>();
 
-    await app.RunAsync();
+eventBus.Subscribe<ProductPriceChangedIntegrationEvent, ProductPriceChangedIntegrationEventHandler>();
+eventBus.Subscribe<OrderStartedIntegrationEvent, OrderStartedIntegrationEventHandler>();
 
-    return 0;
-}
-catch (Exception ex)
-{
-    app.Logger.LogCritical(ex, "Program terminated unexpectedly");
-    return 1;
-}
+await app.RunAsync();
diff --git a/src/Services/Catalog/Catalog.API/Program.cs b/src/Services/Catalog/Catalog.API/Program.cs
index 57e9c929f..9559e57cb 100644
--- a/src/Services/Catalog/Catalog.API/Program.cs
+++ b/src/Services/Catalog/Catalog.API/Program.cs
@@ -7,7 +7,7 @@ builder.AddServiceDefaults();
 builder.Services.AddGrpc();
 builder.Services.AddControllers();
 
-// Applcation specific services
+// Application specific services
 builder.Services.AddDbContexts(builder.Configuration);
 builder.Services.AddApplicationOptions(builder.Configuration);
 builder.Services.AddHealthChecks(builder.Configuration);
@@ -18,6 +18,11 @@ builder.Services.AddTransient<OrderStatusChangedToPaidIntegrationEventHandler>()
 
 var app = builder.Build();
 
+if (!await app.CheckHealthAsync())
+{
+    return;
+}
+
 app.UseServiceDefaults();
 
 app.UseFileServer(new FileServerOptions
diff --git a/src/Services/Catalog/Catalog.API/appsettings.json b/src/Services/Catalog/Catalog.API/appsettings.json
index eb811f017..427b0bd95 100644
--- a/src/Services/Catalog/Catalog.API/appsettings.json
+++ b/src/Services/Catalog/Catalog.API/appsettings.json
@@ -1,9 +1,9 @@
 {
-  "UseCustomizationData": false,
-  "AzureServiceBusEnabled": false,
-  "AzureStorageEnabled": false,
-  "ApplicationInsights": {
-    "InstrumentationKey": ""
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
   },
   "OpenApi": {
     "Endpoint": {
@@ -22,6 +22,12 @@
   "EventBus": {
     "SubscriptionClientName": "Catalog",
     "RetryCount": 5
-  }
+  },
+  "ApplicationInsights": {
+    "InstrumentationKey": ""
+  },
+  "UseCustomizationData": false,
+  "AzureServiceBusEnabled": false,
+  "AzureStorageEnabled": false
 }
-  
+