Merge branch 'master' into production

YaKun9 · Jan 13, 2023 · 998c4ca · 998c4ca
2 parents fdb8c6b + cc585b1
commit 998c4ca
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/SageTools/Utils/ExtensionUtils.cs b/SageTools/Utils/ExtensionUtils.cs
@@ -23,9 +23,16 @@ public static T DelayRetry<T>(Func<T> executeFunc, Func<T, bool> breakConditionF
             while (retryCount > 0)
             {
                 retryCount--;
-                res = executeFunc.Invoke();
-                if (breakConditionFunc.Invoke(res)) break;
-                Task.Delay(milliseconds).Wait();
+                try
+                {
+                    res = executeFunc.Invoke();
+                    if (breakConditionFunc.Invoke(res)) break;
+                    Task.Delay(milliseconds).Wait();
+                }
+                catch
+                {
+                    Task.Delay(milliseconds).Wait();
+                }
             }
 
             return res;
@@ -46,9 +53,16 @@ public static async Task<T> DelayRetryAsync<T>(Func<Task<T>> executeFunc, Func<T
             while (retryCount > 0)
             {
                 retryCount--;
-                res = await executeFunc.Invoke();
-                if (breakConditionFunc.Invoke(res)) break;
-                await Task.Delay(milliseconds);
+                try
+                {
+                    res = await executeFunc.Invoke();
+                    if (breakConditionFunc.Invoke(res)) break;
+                    await Task.Delay(milliseconds);
+                }
+                catch
+                {
+                    Task.Delay(milliseconds).Wait();
+                }
             }
 
             return res;