Always close socket on error (reset_sock). (#1767)

Author: janiversen

pymodbus/repl/client/main.py

@@ -263,11 +263,6 @@ def run(self):
     "--retry-on-error", is_flag=True, default=False, help="Retry on error response"
 )
 @click.option("--retries", default=3, help="Retry count")
-@click.option(
-    "--reset-socket/--no-reset-socket",
-    default=True,
-    help="Reset client socket on error",
-)
 @click.pass_context
 def main(
     ctx,
@@ -276,7 +271,6 @@ def main(
     retry_on_empty,
     retry_on_error,
     retries,
-    reset_socket,
 ):
     """Run Main."""
     if verbose:
@@ -291,7 +285,6 @@ def main(
         "retry_on_empty": retry_on_empty,
         "retry_on_invalid": retry_on_error,
         "retries": retries,
-        "reset_socket": reset_socket,
     }
 
 

pymodbus/transaction.py

@@ -63,7 +63,6 @@ def __init__(self, client, **kwargs):
         self.retry_on_empty = kwargs.get("retry_on_empty", False)
         self.retry_on_invalid = kwargs.get("retry_on_invalid", False)
         self.retries = kwargs.get("retries", 3)
-        self.reset_socket = kwargs.get("reset_socket", True)
         self._transaction_lock = RLock()
         self._no_response_devices = []
         if client:
@@ -232,8 +231,7 @@ def execute(self, request):  # noqa: C901
                             response = ModbusIOException(
                                 last_exception, request.function_code
                             )
-                        if self.reset_socket:
-                            self.client.close()
+                        self.client.close()
                     if hasattr(self.client, "state"):
                         Log.debug(
                             "Changing transaction state from "
@@ -247,8 +245,7 @@ def execute(self, request):  # noqa: C901
                 # Handle decode errors in processIncomingPacket method
                 Log.error("Modbus IO exception {}", exc)
                 self.client.state = ModbusTransactionState.TRANSACTION_COMPLETE
-                if self.reset_socket:
-                    self.client.close()
+                self.client.close()
                 return exc
 
     def _retry_transaction(self, retries, reason, packet, response_length, full=False):
@@ -317,8 +314,7 @@ def _transact(self, packet, response_length, full=False, broadcast=False):
             # result2 = self._recv(response_length, full)
             Log.debug("RECV: {}", result, ":hex")
         except (OSError, ModbusIOException, InvalidMessageReceivedException) as msg:
-            if self.reset_socket:
-                self.client.close()
+            self.client.close()
             Log.debug("Transaction failed. ({}) ", msg)
             last_exception = msg
             result = b""