refactored

VahidFarahmandian · Nov 2, 2024 · 11bb369 · 11bb369
1 parent 0ca4ce2
commit 11bb369
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/03-Infrastructure/Jinget.ExceptionHandler/Extensions/IServiceCollectionExtensions.cs b/03-Infrastructure/Jinget.ExceptionHandler/Extensions/IServiceCollectionExtensions.cs
@@ -4,9 +4,9 @@ public static class IServiceCollectionExtensions
 {
     public static void ConfigureJingetExceptionHandler(this IServiceCollection services, BaseSettingModel baseSetting)
     {
+        services.TryAddSingleton(baseSetting);
         if (baseSetting.UseGlobalExceptionHandler)
         {
-            services.TryAddSingleton(baseSetting);
             services.AddProblemDetails();
 
             if (baseSetting.Handle4xxResponses)

diff --git a/03-Infrastructure/Jinget.Logger/Extensions/IApplicationBuilderExtensions.cs b/03-Infrastructure/Jinget.Logger/Extensions/IApplicationBuilderExtensions.cs
@@ -10,7 +10,10 @@ public static class IApplicationBuilderExtensions
     /// </summary>
     public static IApplicationBuilder UseJingetLogging(this IApplicationBuilder app)
     {
-        app.UseJingetExceptionHandler();
+        var settings = app.ApplicationServices.GetJingetService<BaseSettingModel>();
+
+        if (settings != null && settings.UseGlobalExceptionHandler)
+            app.UseJingetExceptionHandler();
         app.UseMiddleware<LogRequestMiddleware>();
         app.UseMiddleware<LogResponseMiddleware>();
 

diff --git a/Tests/Jinget.WebAPI.Tests/Program.cs b/Tests/Jinget.WebAPI.Tests/Program.cs
@@ -28,7 +28,7 @@
     Url = "localhost:9200",
     UseSsl = false,
     UseGlobalExceptionHandler = true,
-    Handle4xxResponses = true
+    Handle4xxResponses = false
 };
 builder.Services.ConfigureElasticSearchLogger(elasticSearchSetting);
 builder.Services.AddControllers();