self code review

Signed-off-by: imarom <imarom@cisco.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
index 1461fcec..4ebfa0be 100644
--- a/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
+++ b/scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_jsonrpc_client.py
@@ -172,6 +172,10 @@ class JsonRpcClient(object):
                     self.disconnect()
                     return RC_ERR("*** [RPC] - Failed to send message to server")
 
+            except KeyboardInterrupt as e:
+                # must restore the socket to a sane state
+                self.reconnect()
+                raise e
 
         tries = 0
         while True:
@@ -184,6 +188,10 @@ class JsonRpcClient(object):
                     self.disconnect()
                     return RC_ERR("*** [RPC] - Failed to get server response from {0}".format(self.transport))
 
+            except KeyboardInterrupt as e:
+                # must restore the socket to a sane state
+                self.reconnect()
+                raise e
 
         return response
        
@@ -267,12 +275,6 @@ class JsonRpcClient(object):
         # connect using current values
         return self.connect()
 
-        if not self.connected:
-            return RC_ERR("Not connected to server")
-
-        # reconnect
-        return self.connect(self.server, self.port)
-
 
     def is_connected(self):
         return self.connected