first working code for reservations

[nodemanager.git] / curlwrapper.py

diff --git a/curlwrapper.py b/curlwrapper.py
index da5810c..c1f59c3 100644 (file)
--- a/curlwrapper.py
+++ b/curlwrapper.py
@@ -8,9 +8,12 @@ import logger
 
 # a pycurl-based replacement for the previous version that relied on forking curl
 
+debug=False
+
 def retrieve(url, cacert=None, postdata=None, timeout=90):
     curl= pycurl.Curl()
     curl.setopt(pycurl.URL,url)
+    if debug: logger.verbose('curlwrapper: new instance %r -> %s'%(curl,url))
 
     # reproduce --fail from the previous version
     curl.setopt(pycurl.FAILONERROR,1)
@@ -20,19 +23,21 @@ def retrieve(url, cacert=None, postdata=None, timeout=90):
     # do not follow location when attempting to download a file
     # curl.setopt(pycurl.FOLLOWLOCATION, 0)
 
-    # store result on the fly 
+    # store result on the fly
     buffer=StringIO()
     curl.setopt(pycurl.WRITEFUNCTION,buffer.write)
-           
+
     # set timeout
-    if timeout: 
+    if timeout:
         curl.setopt(pycurl.CONNECTTIMEOUT, timeout)
         curl.setopt(pycurl.TIMEOUT, timeout)
+        if debug: logger.verbose('curlwrapper: timeout set to %r'%timeout)
 
     # set cacert
-    if cacert: 
+    if cacert:
         curl.setopt(pycurl.CAINFO, cacert)
         curl.setopt(pycurl.SSL_VERIFYPEER, 2)
+        if debug: logger.verbose('curlwrapper: using cacert %s'%cacert)
     else:
         curl.setopt(pycurl.SSL_VERIFYPEER, 0)
 
@@ -40,25 +45,28 @@ def retrieve(url, cacert=None, postdata=None, timeout=90):
     if postdata:
         if isinstance(postdata,dict):
             postfields = urllib.urlencode(postdata)
+            if debug: logger.verbose('curlwrapper: using encoded postfields %s'%postfields)
         else:
-           postfields=postdata
+            postfields=postdata
+            if debug: logger.verbose('curlwrapper: using raw postfields %s'%postfields)
         curl.setopt(pycurl.POSTFIELDS, postfields)
 
     # go
     try:
         curl.perform()
-
         errcode = curl.getinfo(pycurl.HTTP_CODE)
+
+        if debug: logger.verbose('curlwrapper: closing pycurl object')
         curl.close()
 
         # check the code, return 1 if successfull
-       if errcode == 60:
-           raise xmlrpclib.ProtocolError (url,errcode, "SSL certificate validation failed", postdata)
+        if errcode == 60:
+            raise xmlrpclib.ProtocolError (url,errcode, "SSL certificate validation failed", postdata)
         elif errcode != 200:
             raise xmlrpclib.ProtocolError (url,errcode, "http error %d"%errcode, postdata)
 
     except pycurl.error, err:
         errno, errstr = err
-        raise xmlrpclib.ProtocolError(url, errno, "curl error %d: '%s'\n" %(errno,errstr),postdata )
+        raise xmlrpclib.ProtocolError(url, errno, "curl error %d: '%s'\n" %(errno,curl.errstr()),postdata )
 
     return buffer.getvalue()