short-circuit loop after failed request

mythz · mythz · commit 562d100bdb81 · 2025-12-02T15:45:45.000+08:00
diff --git a/ServiceStack/src/ServiceStack.Jobs/SqliteRequestLogger.cs b/ServiceStack/src/ServiceStack.Jobs/SqliteRequestLogger.cs
@@ -460,6 +460,7 @@ public AnalyticsReports GetAnalyticsReports(AnalyticsConfig config, DateTime mon
                 Logger?.LogWarning(e, "GetAnalyticsReports(): SELECT RequestLog WHERE Id > {LastPk}: {Message}", 
                     lastPk, e.Message);
                 lastPk += config.BatchSize; // avoid infinite loops
+                continue;
             }
             
             foreach (var requestLog in batch)
@@ -521,6 +522,7 @@ public AnalyticsReports GetApiAnalytics(AnalyticsConfig config, DateTime month,
                 Logger?.LogWarning(e, "GetApiAnalytics(): SELECT RequestLog WHERE Id > {LastPk} AND OperationName = {Op}: {Message}", 
                     lastPk, op, e.Message);
                 lastPk += config.BatchSize; // avoid infinite loops
+                continue;
             }
             
             foreach (var requestLog in batch)
@@ -594,6 +596,7 @@ public AnalyticsReports GetUserAnalytics(AnalyticsConfig config, DateTime month,
                 Logger?.LogWarning(e, "GetUserAnalytics(): SELECT RequestLog WHERE Id > {LastPk} AND UserAuthId = {UserId}: {Message}", 
                     lastPk, userId, e.Message);
                 lastPk += config.BatchSize; // avoid infinite loops
+                continue;
             }
             
             foreach (var requestLog in batch)
@@ -670,6 +673,7 @@ public AnalyticsReports GetApiKeyAnalytics(AnalyticsConfig config, DateTime mont
                 Logger?.LogWarning(e, "GetApiKeyAnalytics(): SELECT RequestLog WHERE Id > {LastPk}: {Message}", 
                     lastPk, e.Message);
                 lastPk += config.BatchSize; // avoid infinite loops
+                continue;
             }
             
             foreach (var requestLog in batch)
@@ -745,6 +749,7 @@ public AnalyticsReports GetIpAnalytics(AnalyticsConfig config, DateTime month, s
                 Logger?.LogWarning(e, "GetIpAnalytics(): SELECT RequestLog WHERE Id > {LastPk} AND IpAddress = {Ip}: {Message}", 
                     lastPk, ip, e.Message);
                 lastPk += config.BatchSize; // avoid infinite loops
+                continue;
             }
             
             foreach (var requestLog in batch)
diff --git a/ServiceStack/src/ServiceStack.Server/DbRequestLogger.cs b/ServiceStack/src/ServiceStack.Server/DbRequestLogger.cs
@@ -589,6 +589,7 @@ public AnalyticsReports GetAnalyticsReports(AnalyticsConfig config, DateTime mon
                 Logger?.LogWarning(e, "GetAnalyticsReports(): SELECT RequestLog WHERE Id > {LastPk}: {Message}", 
                     lastPk, e.Message);
                 lastPk += config.BatchSize; // avoid infinite loops
+                continue;
             }
             
             foreach (var requestLog in batch)
@@ -650,6 +651,7 @@ public AnalyticsReports GetApiAnalytics(AnalyticsConfig config, DateTime month,
                 Logger?.LogWarning(e, "GetApiAnalytics(): SELECT RequestLog WHERE Id > {LastPk} AND OperationName = {Op}: {Message}", 
                     lastPk, op, e.Message);
                 lastPk += config.BatchSize; // avoid infinite loops
+                continue;
             }
             
             foreach (var requestLog in batch)
@@ -723,6 +725,7 @@ public AnalyticsReports GetUserAnalytics(AnalyticsConfig config, DateTime month,
                 Logger?.LogWarning(e, "GetUserAnalytics(): SELECT RequestLog WHERE Id > {LastPk} AND UserAuthId = {UserId}: {Message}", 
                     lastPk, userId, e.Message);
                 lastPk += config.BatchSize; // avoid infinite loops
+                continue;
             }
             
             foreach (var requestLog in batch)
@@ -801,6 +804,7 @@ public AnalyticsReports GetApiKeyAnalytics(AnalyticsConfig config, DateTime mont
                 Logger?.LogWarning(e, "GetApiKeyAnalytics(): SELECT RequestLog WHERE Id > {LastPk}: {Message}", 
                     lastPk, e.Message);
                 lastPk += config.BatchSize; // avoid infinite loops
+                continue;
             }
             
             foreach (var requestLog in batch)
@@ -876,6 +880,7 @@ public AnalyticsReports GetIpAnalytics(AnalyticsConfig config, DateTime month, s
                 Logger?.LogWarning(e, "GetIpAnalytics(): SELECT RequestLog WHERE Id > {LastPk} AND IpAddress = {Ip}: {Message}", 
                     lastPk, ip, e.Message);
                 lastPk += config.BatchSize; // avoid infinite loops
+                continue;
             }
             
             foreach (var requestLog in batch)
