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

[gnunet]

Author: wachs
Date: 2013-07-19 11:09:57 +0200 (Fri, 19 Jul 2013)
New Revision: 28186

Modified:
   gnunet-planetlab/gplmt/gplmt/Notifications.py
   gnunet-planetlab/gplmt/gplmt/Worker.py
Log:
-minor output fixes and switching to SSH for Planetlab


Modified: gnunet-planetlab/gplmt/gplmt/Notifications.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Notifications.py       2013-07-19 08:59:17 UTC 
(rev 28185)
+++ gnunet-planetlab/gplmt/gplmt/Notifications.py       2013-07-19 09:09:57 UTC 
(rev 28186)
@@ -254,6 +254,8 @@
     def tasklist_completed (self, node, tasks, success, message):
         if (success == Tasklist.Taskresult.success):
             print node.hostname + " : Tasklist '" +  tasks.name + "' completed 
successfully"
+        elif (success == Tasklist.Taskresult.user_interrupt):
+            print node.hostname + " : Tasklist '" +  tasks.name + "' was 
interrupted"
         else:
             print node.hostname + " : Tasklist '" +  tasks.name + "' completed 
with failure"
     def task_started (self, node, task, message):
@@ -264,4 +266,4 @@
         elif (result == Tasklist.Taskresult.src_file_not_found):
             print node.hostname + " : Task '" +  task.name + "' failed : 
source file not found: " + message
         else:
-            print node.hostname + " : Task '" +  task.name + "' completed with 
failure" + message   
+            print node.hostname + " : Task '" +  task.name + "' completed with 
failure: " + message   

Modified: gnunet-planetlab/gplmt/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Worker.py      2013-07-19 08:59:17 UTC (rev 
28185)
+++ gnunet-planetlab/gplmt/gplmt/Worker.py      2013-07-19 09:09:57 UTC (rev 
28186)
@@ -402,8 +402,8 @@
             if (task.expected_return_code != -1):                    
                 if (exit_status != task.expected_return_code):
                     g_logger.log (self.node.hostname + " : Task '"+ task.name 
+ "' completed after "+ str(time.time() - start_time) +" sec, but exit code " 
+str(exit_status)+ " was not as expected " + str(task.expected_return_code))
-                    g_logger.log (stdout_data)
-                    g_logger.log (stderr_data)
+                    #g_logger.log (stdout_data)
+                    #g_logger.log (stderr_data)
                     result = Tasks.Taskresult.return_value_did_not_match
                 else:
                     g_logger.log (self.node.hostname + " : Task '"+ task.name 
+ "' completed after "+ str(time.time() - start_time) +" sec, exit code " 
+str(exit_status)+ " was as expected " + str(task.expected_return_code))        
    
@@ -524,7 +524,7 @@
         elif (self.target == Targets.Target (Targets.Target.remote_ssh)):
             self.thread = RemoteSSHWorker (1, self.node, self.tasks);
         elif (self.target == Targets.Target (Targets.Target.planetlab)):
-            self.thread = PlanetLabWorker (1, self.node, self.tasks);   
+            self.thread = RemoteSSHWorker (1, self.node, self.tasks);   
         return        
     def start (self):
         g_logger.log ("Starting execution for node " + self.node.hostname)