expects the 'interfaces' key in GetSlivers - review logs to always mention module

[nodemanager.git] / curlwrapper.py

diff --git a/curlwrapper.py b/curlwrapper.py
index 3bfe491..81c9c14 100644 (file)
--- a/curlwrapper.py
+++ b/curlwrapper.py
@@ -14,7 +14,8 @@ class Sopen(Popen):
         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', '--silent')
+    options = ('/usr/bin/curl', '--fail', )
     if cacert: options += ('--cacert', cacert)
     if postdata: options += ('--data', '@-')
     if timeout: 
@@ -32,6 +33,7 @@ def retrieve(url, cacert=None, postdata=None, timeout=90):
     rc = p.wait()
     if rc != 0: 
         # when this triggers, the error sometimes doesn't get printed
+        logger.log ("curlwrapper: retrieve, got stderr <%s>"%err)
         raise xmlrpclib.ProtocolError(url, rc, err, postdata)
     else: 
         return data