t-rex-64: catch exit with trap to restore tty settings

Change-Id: Id336aa95ceff5e958e9bce329c85eb7201772712
Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/scripts/automation/trex_control_plane/server/zmq_monitor_thread.py b/scripts/automation/trex_control_plane/server/zmq_monitor_thread.py
index 172e2eb3..950e909f 100755
--- a/scripts/automation/trex_control_plane/server/zmq_monitor_thread.py
+++ b/scripts/automation/trex_control_plane/server/zmq_monitor_thread.py
@@ -48,12 +48,12 @@ class ZmqMonitorSession(threading.Thread):
                         pass

                     else:

                         logger.error("ZMQ monitor thrown an exception. Received exception: {ex}".format(ex=e))

-                        raise

+                        self.trexObj.zmq_error = e

         except Exception as e:

             logger.error('ZMQ monitor error: %s' % e)

             self.trexObj.zmq_error = e

 

-    def join(self, timeout=None):

+    def join(self, timeout=5):

         self.stoprequest.set()

         logger.debug("Handling termination of ZMQ monitor thread") 

         self.socket.close()