at long last, fixed my silly bugs

NielsPilgaard · May 6, 2024 · de1d9d3 · de1d9d3
1 parent 3c35ba1
commit de1d9d3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/src/shared/Jordnaer.Shared.Infrastructure/AzureAppConfigurationExtensions.cs b/src/shared/Jordnaer.Shared.Infrastructure/AzureAppConfigurationExtensions.cs
@@ -16,8 +16,7 @@ public static WebApplicationBuilder AddAzureAppConfiguration(this WebApplication
 			return builder;
 		}
 
-
-		var connectionString = builder.Configuration.GetConnectionString("")
+		var connectionString = builder.Configuration.GetConnectionString("AppConfig")
 							   ?? throw new InvalidOperationException(
 								   "Failed to find connection string to Azure App Configuration. " +
 								   "Keys checked: 'ConnectionStrings:AppConfig'");
@@ -30,9 +29,8 @@ public static WebApplicationBuilder AddAzureAppConfiguration(this WebApplication
 					// Only reload configs if the 'Sentinel' key is modified
 					refreshOptions.Register("Sentinel", refreshAll: true))
 				.UseFeatureFlags());
-
 		builder.Services.AddAzureAppConfiguration();
 
 		return builder;
 	}
-}
+}
diff --git a/src/shared/Jordnaer.Shared.Infrastructure/SerilogExtensions.cs b/src/shared/Jordnaer.Shared.Infrastructure/SerilogExtensions.cs
@@ -16,19 +16,8 @@ public static class SerilogExtensions
 {
 	public static WebApplicationBuilder AddSerilog(this WebApplicationBuilder builder)
 	{
-		builder.Host.UseSerilog((context, provider, loggerConfiguration) =>
+		if (!builder.Environment.IsDevelopment())
 		{
-			loggerConfiguration.ReadFrom.Configuration(context.Configuration)
-				.Enrich.WithProperty("Application", builder.Environment.ApplicationName)
-				.Enrich.FromLogContext()
-				.Enrich.WithExceptionDetails();
-
-			loggerConfiguration.WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss}] [{Level}] {SourceContext}: {Message:lj}{NewLine}{Exception}");
-
-			if (context.HostingEnvironment.IsDevelopment())
-			{
-				return;
-			}
 
 			builder.Services
 				   .AddOptions<GrafanaLokiOptions>()
@@ -41,6 +30,21 @@ public static WebApplicationBuilder AddSerilog(this WebApplicationBuilder builde
 				   .BindConfiguration(ElmahIoOptions.SectionName)
 				   .ValidateDataAnnotations()
 				   .ValidateOnStart();
+		}
+
+		builder.Host.UseSerilog((context, provider, loggerConfiguration) =>
+		{
+			loggerConfiguration.ReadFrom.Configuration(context.Configuration)
+				.Enrich.WithProperty("Application", builder.Environment.ApplicationName)
+				.Enrich.FromLogContext()
+				.Enrich.WithExceptionDetails();
+
+			loggerConfiguration.WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss}] [{Level}] {SourceContext}: {Message:lj}{NewLine}{Exception}");
+
+			if (context.HostingEnvironment.IsDevelopment())
+			{
+				return;
+			}
 
 			loggerConfiguration.WriteToLoki(provider);
 			loggerConfiguration.WriteToElmahIo(provider);