From: Alina Quereilhac Date: Tue, 16 Dec 2014 17:32:40 +0000 (+0100) Subject: linux_scalability_benchmark_d_0_rev_5df377e20342.data X-Git-Tag: nepi-3.2.0~37 X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=7201fc6232a150a7e8a6c981b9c66bb53c3f6cff linux_scalability_benchmark_d_0_rev_5df377e20342.data --- diff --git a/src/nepi/resources/ns3/ns3server.py b/src/nepi/resources/ns3/ns3server.py index 5f756ae6..076f26a6 100644 --- a/src/nepi/resources/ns3/ns3server.py +++ b/src/nepi/resources/ns3/ns3server.py @@ -109,7 +109,7 @@ def close_socket(sock): except: pass -def recv_msg(conn): +def recv_msg(conn, ns3_wrapper): msg = [] chunk = '' @@ -117,6 +117,10 @@ def recv_msg(conn): try: chunk = conn.recv(1024) except (OSError, socket.error), e: + import traceback + err = traceback.format_exc() + ns3_wrapper.logger.error(err) + if e[0] != errno.EINTR: raise # Ignore eintr errors @@ -206,7 +210,7 @@ def run_server(socket_name, level = logging.INFO, ns_log = None, conn.settimeout(5) try: - (msg_type, args, kwargs) = recv_msg(conn) + (msg_type, args, kwargs) = recv_msg(conn, ns3_wrapper) except socket.timeout, e: # Ingore time-out close_socket(conn)