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

[gnunet]

Author: wachs
Date: 2012-07-23 18:50:52 +0200 (Mon, 23 Jul 2012)
New Revision: 22856

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

Modified: gnunet-planetlab/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/Worker.py    2012-07-23 16:40:29 UTC (rev 22855)
+++ gnunet-planetlab/gplmt/Worker.py    2012-07-23 16:50:52 UTC (rev 22856)
@@ -46,7 +46,7 @@
     def exec_run (self, task, transport):
         try:
             channel = transport.open_session()
-            #channel.settimeout(1.0)
+            channel.settimeout(1.0)
             channel.get_pty ()
             #print "CMD: " + task.command + " " + task.arguments
             channel.exec_command(task.command + " " + task.arguments)
@@ -78,20 +78,20 @@
                     data = r[0].recv(4096)
                     if data:
                         got_data = True
-                        g_logger.log ('STDOUT: ' + data)
+                        #g_logger.log ('STDOUT: ' + data)
                         stdout_data += data
                 if channel.recv_stderr_ready():
                     data = r[0].recv_stderr(4096)
                     if data:
                         got_data = True
-                        g_logger.log ('STDERR: ' + data)
+                        #g_logger.log ('STDERR: ' + data)
                         stderr_data += data
                 if not got_data:
                     break
         
         if (result == Tasks.Taskresult.success):
             exit_status = channel.recv_exit_status ()  
-        print "RESULT " + str(time.time() - start_time) + "   " + 
str(exit_status)
+        
         if (result == Tasks.Taskresult.success):
             if (task.expected_return_code != -1):                    
                 if (exit_status != task.expected_return_code):
@@ -184,6 +184,7 @@
             ssh.connect (self.node, 
                          username=g_configuration.pl_slicename, 
                          password=g_configuration.ssh_password,
+                         timeout=10,
                          key_filename=keyfile) 
         except (IOError,
                 paramiko.SSHException,