Merge branch 'tests'

[nepi.git] / src / nepi / resources / netns / netnsserver.py

diff --git a/src/nepi/resources/netns/netnsserver.py b/src/nepi/resources/netns/netnsserver.py
index 85853a1..f2c37f2 100644 (file)
--- a/src/nepi/resources/netns/netnsserver.py
+++ b/src/nepi/resources/netns/netnsserver.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2014 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +17,7 @@
 # Author: Alina Quereilhac <alina.quereilhac@inria.fr>
 
 import base64
-import cPickle
+import pickle
 import errno
 import logging
 import os
@@ -90,7 +89,7 @@ def recv_msg(conn):
     while '\n' not in chunk:
         try:
             chunk = conn.recv(1024)
-        except (OSError, socket.error), e:
+        except (OSError, socket.error) as e:
             if e[0] != errno.EINTR:
                 raise
             # Ignore eintr errors
@@ -111,9 +110,9 @@ def recv_msg(conn):
 
     def decode(item):
         item = base64.b64decode(item).rstrip()
-        return cPickle.loads(item)
+        return pickle.loads(item)
 
-    decoded = map(decode, msg.split("|"))
+    decoded = [ decode(x) for x in msg.split("|")]
 
     # decoded message
     dmsg_type = decoded.pop(0)
@@ -123,7 +122,7 @@ def recv_msg(conn):
     return (dmsg_type, dargs, dkwargs)
 
 def send_reply(conn, reply):
-    encoded = base64.b64encode(cPickle.dumps(reply))
+    encoded = base64.b64encode(pickle.dumps(reply))
     conn.send("%s\n" % encoded)
 
 def get_options():
@@ -154,6 +153,10 @@ def run_server(socket_name, level = logging.INFO,
         enable_dump = False):
 
     ###### wrapper instantiation
+    if level == logging.DEBUG:
+        from syslog import LOG_DEBUG
+        import netns
+        netns.environ.set_log_level(LOG_DEBUG)
 
     wrapper = NetNSWrapper(loglevel=level, enable_dump = enable_dump)
     
@@ -172,7 +175,7 @@ def run_server(socket_name, level = logging.INFO,
 
         try:
             (msg_type, args, kwargs) = recv_msg(conn)
-        except socket.timeout, e:
+        except socket.timeout as e:
             # Ingore time-out
             continue
 
@@ -205,7 +208,7 @@ if __name__ == '__main__':
     ## configure logging
     FORMAT = "%(asctime)s %(name)s %(levelname)-4s %(message)s"
     level = logging.DEBUG if verbose else logging.INFO
-
+    
     logging.basicConfig(format = FORMAT, level = level)
 
     ## Run the server