Revert "Delay callback_disconnected() until reconnect_delay_max. (#2210…

…)" This reverts commit 45a998b.
pymodbus-dev · May 31, 2024 · 450b96f · 450b96f
1 parent 45a998b
commit 450b96f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pymodbus/transport/transport.py b/pymodbus/transport/transport.py
@@ -473,11 +473,10 @@ async def do_reconnect(self) -> None:
                 await asyncio.sleep(self.reconnect_delay_current)
                 if await self.connect():
                     break
-                self.reconnect_delay_current = 2 * self.reconnect_delay_current
-                if self.reconnect_delay_current > self.comm_params.reconnect_delay_max:
-                    self.callback_disconnected(Exception("Retry connect timeout."))
-                    self.reconnect_delay_current = self.comm_params.reconnect_delay_max
-                    break
+                self.reconnect_delay_current = min(
+                    2 * self.reconnect_delay_current,
+                    self.comm_params.reconnect_delay_max,
+                )
         except asyncio.CancelledError:
             pass
         self.reconnect_task = None

diff --git a/test/transport/test_reconnect.py b/test/transport/test_reconnect.py
@@ -52,9 +52,9 @@ async def test_multi_reconnect_call(self, client):
         assert client.reconnect_delay_current == client.comm_params.reconnect_delay * 2
         await asyncio.sleep(client.reconnect_delay_current * 1.8)
         assert client.call_create.call_count == 3
-        assert client.reconnect_delay_current >= client.comm_params.reconnect_delay_max
+        assert client.reconnect_delay_current == client.comm_params.reconnect_delay_max
         await asyncio.sleep(client.reconnect_delay_current * 1.8)
-        assert client.call_create.call_count >= 3
+        assert client.call_create.call_count >= 4
         assert client.reconnect_delay_current == client.comm_params.reconnect_delay_max
         client.close()