X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=blobdiff_plain;f=curlwrapper.py;h=08223e39a2499411cfbd99b56139a49604748ca0;hp=81c9c1411468a0a8c906b3f34d0006440ac6bb3d;hb=9e6b9c1ea9e020c55c85b433bac47231d63e9ffd;hpb=74a8cfb9d2eac39ae02e5323e1fb5b1d33297981

diff --git a/curlwrapper.py b/curlwrapper.py
index 81c9c14..08223e3 100644
--- a/curlwrapper.py
+++ b/curlwrapper.py
@@ -1,27 +1,38 @@
-# $Id$
-# $URL$
+# Note
+# in spring 2010, an attempt was made to use pycurl instead of forking curl
+# it turned out, however, that after around 10 cycles of the nodemanager,
+# attempts to call GetSlivers were failing with a curl error 60
+# we are thus reverting to the version from tag curlwrapper.py-NodeManager-2.0-8
+# the (broken) pycurl version can be found in tags 2.0-9 and 2.0-10
 
 from subprocess import PIPE, Popen
 from select import select
-# raise xmplrpclib.ProtocolError
 import xmlrpclib
 import signal
 import os
+
 import logger
 
+verbose=False
+#verbose=True
+
 class Sopen(Popen):
     def kill(self, signal = signal.SIGTERM):
         os.kill(self.pid, signal)
 
 def retrieve(url, cacert=None, postdata=None, timeout=90):
-#    options = ('/usr/bin/curl', '--fail', '--silent')
-    options = ('/usr/bin/curl', '--fail', )
-    if cacert: options += ('--cacert', cacert)
-    if postdata: options += ('--data', '@-')
+#    command = ('/usr/bin/curl', '--fail', '--silent')
+    command = ('/usr/bin/curl', '--fail', )
+    if cacert: command += ('--cacert', cacert)
+    if postdata: command += ('--data', '@-')
     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)
+        command += ('--max-time', str(timeout))
+        command += ('--connect-timeout', str(timeout))
+    command += (url,)
+    if verbose:
+        print 'Invoking ',command
+        if postdata: print 'with postdata=',postdata
+    p = Sopen(command , 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)