From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 4 Aug 2011 20:17:14 +0000 (-0400)
Subject: remote connections timeout after 30 seconds
X-Git-Tag: sfa-1.0-29~2^2~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bed506fdde4d9fa51b510430a434d5da1685c657;p=sfa.git

remote connections timeout after 30 seconds
---

diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py
index f23d4d82..7ad48f90 100644
--- a/sfa/managers/slice_manager_pl.py
+++ b/sfa/managers/slice_manager_pl.py
@@ -394,7 +394,7 @@ def get_ticket(api, xrn, creds, rspec, users):
                     continue
                 # send the request to this address 
                 url = target_aggs[0]['url']
-                server = xmlrpcprotocol.get_server(url, api.key_file, api.cert_file)
+                server = xmlrpcprotocol.get_server(url, api.key_file, api.cert_file, timeout=30)
                 # aggregate found, no need to keep looping
                 break   
         if server is None:
diff --git a/sfa/server/interface.py b/sfa/server/interface.py
index f37331a3..52df22be 100644
--- a/sfa/server/interface.py
+++ b/sfa/server/interface.py
@@ -99,6 +99,6 @@ class Interfaces(dict):
                 client_type = 'geniclientlight'
                 connections[hrn] = GeniClientLight(url, self.api.key_file, self.api.cert_file) 
             else:
-                connections[interface['hrn']] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file)
+                connections[interface['hrn']] = xmlrpcprotocol.get_server(url, self.api.key_file, self.api.cert_file, timeout=30)
 
         return connections