diff options
Diffstat (limited to 'scripts/automation/trex_control_plane/server/zmq_monitor_thread.py')
| -rwxr-xr-x | scripts/automation/trex_control_plane/server/zmq_monitor_thread.py | 4 |
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()
|