[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25774 - in gnunet-planetlab/gplmt: contrib/tasklists gplmt
From: |
gnunet |
Subject: |
[GNUnet-SVN] r25774 - in gnunet-planetlab/gplmt: contrib/tasklists gplmt |
Date: |
Mon, 14 Jan 2013 13:38:27 +0100 |
Author: wachs
Date: 2013-01-14 13:38:27 +0100 (Mon, 14 Jan 2013)
New Revision: 25774
Modified:
gnunet-planetlab/gplmt/contrib/tasklists/deploy_gnunet_conf.xml
gnunet-planetlab/gplmt/gplmt/Worker.py
Log:
catch scp exception
Modified: gnunet-planetlab/gplmt/contrib/tasklists/deploy_gnunet_conf.xml
===================================================================
--- gnunet-planetlab/gplmt/contrib/tasklists/deploy_gnunet_conf.xml
2013-01-14 12:25:56 UTC (rev 25773)
+++ gnunet-planetlab/gplmt/contrib/tasklists/deploy_gnunet_conf.xml
2013-01-14 12:38:27 UTC (rev 25774)
@@ -5,7 +5,7 @@
<!-- Check if peer is working -->
<command>sudo date</command>
<arguments></arguments>
- <timeout>10</timeout>
+ <timeout>30</timeout>
<expected_return_code>0</expected_return_code>
<expected_output>2013</expected_output>
<stop_on_fail>true</stop_on_fail>
Modified: gnunet-planetlab/gplmt/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Worker.py 2013-01-14 12:25:56 UTC (rev
25773)
+++ gnunet-planetlab/gplmt/gplmt/Worker.py 2013-01-14 12:38:27 UTC (rev
25774)
@@ -37,6 +37,7 @@
import gplmt.Configuration as Configuration
import gplmt.Tasks as Tasks
from gplmt.SCP import SCPClient
+ from gplmt.SCP import SCPException
except ImportError as e:
print "That's a bug! please check README: " + str(e)
sys.exit(1)
@@ -221,8 +222,13 @@
result = Tasks.Taskresult.success
try:
if (g_configuration.ssh_transfer ==
Configuration.TransferMode.scp):
- scp = SCPClient (transport)
- scp.put (task.src, task.dest)
+ try:
+ scp = SCPClient (transport)
+ scp.put (task.src, task.dest)
+ except SCPException as e:
+ g_logger.log (self.node + " : Task '"+ task.name + "' :" +
str(e))
+ result = Tasks.Taskresult.fail
+ pass
if (g_configuration.ssh_transfer ==
Configuration.TransferMode.sftp):
sftp = paramiko.SFTPClient.from_transport (transport)
sftp.put(task.src, task.dest)
@@ -241,8 +247,13 @@
result = Tasks.Taskresult.success
try:
if (g_configuration.ssh_transfer ==
Configuration.TransferMode.scp):
- scp = SCPClient (transport)
- scp.get (task.src, task.dest)
+ try:
+ scp = SCPClient (transport)
+ scp.get (task.src, task.dest)
+ except SCPException as e:
+ g_logger.log (self.node + " : Task '"+ task.name + "' :" +
str(e))
+ result = Tasks.Taskresult.fail
+ pass
if (g_configuration.ssh_transfer ==
Configuration.TransferMode.sftp):
sftp = paramiko.SFTPClient.from_transport (transport)
sftp.get (task.src, task.dest)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25774 - in gnunet-planetlab/gplmt: contrib/tasklists gplmt,
gnunet <=