[GNUnet-SVN] r22791 - gnunet-planetlab/gplmt

[gnunet]

Author: wachs
Date: 2012-07-20 14:43:27 +0200 (Fri, 20 Jul 2012)
New Revision: 22791

Modified:
   gnunet-planetlab/gplmt/Nodes.py
Log:
- fix

Modified: gnunet-planetlab/gplmt/Nodes.py
===================================================================
--- gnunet-planetlab/gplmt/Nodes.py     2012-07-20 12:22:10 UTC (rev 22790)
+++ gnunet-planetlab/gplmt/Nodes.py     2012-07-20 12:43:27 UTC (rev 22791)
@@ -51,7 +51,7 @@
         self.configuration = configuration
         self.nodes = list ()
     def load (self):        
-        self.logger.log ("Retrieving nodes assigned to slice '" + 
self.configuration.pl_slicename + "'")
+
         if (self.configuration.pl_password == ""):
             print "No PlanetLab password given in configuration fail!"
             return False
@@ -61,6 +61,7 @@
         if (self.configuration.pl_api_url == ""):            
             print "No PlanetLab API url given in configuration, fail!"
             return False
+        self.logger.log ("Retrieving nodes assigned to slice '" + 
self.configuration.pl_slicename + "' for user " +self.configuration.pl_username)
         try:
             server = xmlrpclib.ServerProxy(self.configuration.pl_api_url)
         except:
@@ -78,8 +79,8 @@
         try:
             node_ids = server.GetSlices(auth, [slice_data['name']], 
['node_ids'])[0]['node_ids']
             node_hostnames = [node['hostname'] for node in 
server.GetNodes(auth, node_ids, ['hostname'])]
-        except:
-            print "Could not retrieve data from PlanetLab API, fail!"
+        except Exception as e:
+            print "Could not retrieve data from PlanetLab API: " + str(e)
             return False            
         
         for node in node_hostnames: