Fix unexpected timeout errors in logs during laptop sleeping.

JetBrains · Dec 6, 2023 · d26a073 · d26a073
1 parent 1823afd
commit d26a073
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/rd-net/RdFramework/Tasks/RdCall.cs b/rd-net/RdFramework/Tasks/RdCall.cs
@@ -157,17 +157,15 @@ public TRes Sync(TReq request, RpcTimeouts? timeouts = null)
       stopwatch.Start();
 
       var timeoutsToUse = RpcTimeouts.GetRpcTimeouts(timeouts);
-      if (!task.Wait(timeoutsToUse.ErrorAwaitTime))
+      if (!task.Wait(timeoutsToUse.WarnAwaitTime))
       {
-        throw new TimeoutException($"Sync execution of rpc `{Location}` is timed out in {timeoutsToUse.ErrorAwaitTime.TotalMilliseconds} ms");
-      }
-
-      stopwatch.Stop();
-
-      var freezeTime = stopwatch.ElapsedMilliseconds;
-      if (freezeTime > timeoutsToUse.WarnAwaitTime.TotalMilliseconds)
-      {
-        Log.Root.Error("Sync execution of rpc `{0}` executed too long: {1} ms", Location, freezeTime);
+        var deltaAwaitTime = timeoutsToUse.ErrorAwaitTime - timeoutsToUse.WarnAwaitTime;
+        var res = deltaAwaitTime > TimeSpan.Zero && task.Wait(deltaAwaitTime);
+        stopwatch.Stop();
+
+        if (!res)
+          throw new TimeoutException($"Sync execution of rpc `{Location}` is timed out in {timeoutsToUse.ErrorAwaitTime.TotalMilliseconds} ms, the freeze time is {stopwatch.ElapsedMilliseconds} ms");
+        Log.Root.Error("Sync execution of rpc `{0}` executed too long: {1} ms, the freeze time: {2} ms", Location, timeoutsToUse.WarnAwaitTime.TotalMilliseconds, stopwatch.ElapsedMilliseconds);
       }
 
       return task.Result.Value.Unwrap();