From c6e14a2d8c1b0aab27d0a0dde1d123153bbf0cbf Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Tue, 16 Dec 2014 18:35:23 +0100 Subject: [PATCH] uncommiting --- src/nepi/resources/ns3/ns3server.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/nepi/resources/ns3/ns3server.py b/src/nepi/resources/ns3/ns3server.py index 076f26a6..5f756ae6 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, ns3_wrapper): +def recv_msg(conn): msg = [] chunk = '' @@ -117,10 +117,6 @@ def recv_msg(conn, ns3_wrapper): 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 @@ -210,7 +206,7 @@ def run_server(socket_name, level = logging.INFO, ns_log = None, conn.settimeout(5) try: - (msg_type, args, kwargs) = recv_msg(conn, ns3_wrapper) + (msg_type, args, kwargs) = recv_msg(conn) except socket.timeout, e: # Ingore time-out close_socket(conn) -- 2.43.0