From cce337439a1db4cf82ac483116b80f7614ed694b Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Thu, 16 Jan 2020 10:54:22 +0300
Subject: [PATCH] fixed logic error on middleware

---
 .../Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs
index 621e78630e..eee629e969 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs
@@ -28,11 +28,6 @@ namespace Volo.Abp.AspNetCore.Auditing
 
         public async Task InvokeAsync(HttpContext context, RequestDelegate next)
         {
-            if (!ShouldWriteAuditLog(context))
-            {
-                await next(context).ConfigureAwait(false);
-                return;
-            }
             bool hasError = false;
             using (var scope = _auditingManager.BeginScope())
             {
@@ -53,7 +48,7 @@ namespace Volo.Abp.AspNetCore.Auditing
                     if (ShouldWriteAuditLog(context, hasError))
                     {
                         await scope.SaveAsync().ConfigureAwait(false);
-                    }                    
+                    }
                 }
             }
         }
@@ -65,10 +60,10 @@ namespace Volo.Abp.AspNetCore.Auditing
                 return false;
             }
 
-            if (Options.AlwaysLogOnException || hasError)
+            if (Options.AlwaysLogOnException && hasError)
             {
                 return true;
-            }            
+            }
 
             if (!Options.IsEnabledForAnonymousUsers && !CurrentUser.IsAuthenticated)
             {