[Cluster-devel] conga/luci/site/luci/Extensions ricci_communic ...

[kupcevic at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-09-26 21:04:47

Modified files:
	luci/site/luci/Extensions: ricci_communicator.py 

Log message:
	luci: set timeout on establishing connections to ricci (luci used to indefinitely block in connect() - preventing normal usage)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_communicator.py.diff?cvsroot=cluster&r1=1.4&r2=1.5

--- conga/luci/site/luci/Extensions/ricci_communicator.py	2006/08/24 20:15:23	1.4
+++ conga/luci/site/luci/Extensions/ricci_communicator.py	2006/09/26 21:04:47	1.5
@@ -23,8 +23,12 @@
         
         # socket
         sock = socket(AF_INET, SOCK_STREAM)
+        sock.settimeout(2.0)
         sock.connect((self.__hostname, self.__port))
         self.ss = ssl(sock, self.__privkey_file, self.__cert_file)
+        sock.settimeout(600.0) # 10 minutes
+        # TODO: data transfer timeout should be much less, 
+        # leave until all calls are async ricci calls
         
         # receive ricci header
         hello = self.__receive()