#327 (#328)

WireMock-Net · Aug 23, 2019 · 2e33bcc · 2e33bcc
1 parent fc64c5f
commit 2e33bcc
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/WireMock.Net/Owin/WireMockMiddleware.cs b/src/WireMock.Net/Owin/WireMockMiddleware.cs
@@ -162,24 +162,19 @@ private void LogRequest(LogEntry entry, bool addRequest)
 
             if (_options.MaxRequestLogCount != null)
             {
-                var amount = _options.LogEntries.Count - _options.MaxRequestLogCount.Value;
-                for (int i = 0; i < amount; i++)
+                foreach (var logEntry in _options.LogEntries.OrderBy(le => le.RequestMessage.DateTime).Take(_options.LogEntries.Count - _options.MaxRequestLogCount.Value).ToList())
                 {
-                    _options.LogEntries.RemoveAt(0);
+                    _options.LogEntries.Remove(logEntry);
                 }
             }
 
             if (_options.RequestLogExpirationDuration != null)
             {
                 var checkTime = DateTime.UtcNow.AddHours(-_options.RequestLogExpirationDuration.Value);
 
-                for (var i = _options.LogEntries.Count - 1; i >= 0; i--)
+                foreach (var logEntry in _options.LogEntries.Where(le => le.RequestMessage.DateTime < checkTime).ToList())
                 {
-                    var le = _options.LogEntries[i];
-                    if (le.RequestMessage.DateTime <= checkTime)
-                    {
-                        _options.LogEntries.RemoveAt(i);
-                    }
+                    _options.LogEntries.Remove(logEntry);
                 }
             }
         }