X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=curlwrapper.py;h=4aa634d76e30be6e8e465900778cdf312ae42883;hb=refs%2Fheads%2F1.7;hp=97a35a3ad332c4f01244667f7bd3dff47b7fb177;hpb=347202d6aab0acc9126767ceaf89df28a29a82ad;p=nodemanager.git

diff --git a/curlwrapper.py b/curlwrapper.py
index 97a35a3..4aa634d 100644
--- a/curlwrapper.py
+++ b/curlwrapper.py
@@ -1,18 +1,36 @@
-from subprocess import PIPE, Popen
+# $Id$
 
+from subprocess import PIPE, Popen
+from select import select
+# raise xmplrpclib.ProtocolError
+import xmlrpclib
+import signal
+import os
+import logger
 
-class CurlException(Exception): pass
+class Sopen(Popen):
+    def kill(self, signal = signal.SIGTERM):
+        os.kill(self.pid, signal)
 
-def retrieve(url, cacert=None, postdata=None, timeout=300):
-    options = ('/usr/bin/curl',)
+def retrieve(url, cacert=None, postdata=None, timeout=90):
+    options = ('/usr/bin/curl', '--fail', '--silent')
     if cacert: options += ('--cacert', cacert)
     if postdata: options += ('--data', '@-')
-    if timeout: options += ('--max-time', str(timeout))
-    p = Popen(options + (url,), stdin=PIPE, stdout=PIPE, stderr=PIPE)
+    if timeout: 
+        options += ('--max-time', str(timeout))
+        options += ('--connect-timeout', str(timeout))
+    p = Sopen(options + (url,), stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
     if postdata: p.stdin.write(postdata)
     p.stdin.close()
+    sout, sin, serr = select([p.stdout,p.stderr],[],[], timeout)
+    if len(sout) == 0 and len(sin) == 0 and len(serr) == 0: 
+        logger.verbose("curlwrapper: timed out after %s" % timeout)
+        p.kill(signal.SIGKILL) 
     data = p.stdout.read()
     err = p.stderr.read()
     rc = p.wait()
-    if rc != 0: raise CurlException(err)
-    else: return data
+    if rc != 0: 
+        # when this triggers, the error sometimes doesn't get printed
+        raise xmlrpclib.ProtocolError(url, rc, err, postdata)
+    else: 
+        return data