Merge pull request #30126 from stanislavb/2015.8

Log S3 API error message
saltstack · Jan 4, 2016 · c06671a · c06671a
2 parents aeec21e + 8c4a101
commit c06671a
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/salt/utils/s3.py b/salt/utils/s3.py
@@ -119,17 +119,15 @@ def query(key, keyid, method='GET', params=None, headers=None,
     if not data:
         data = None
 
-    try:
-        result = requests.request(method, requesturl, headers=headers,
-                                  data=data,
-                                  verify=verify_ssl)
-        response = result.content
-    except requests.exceptions.HTTPError as exc:
-        log.error('Failed to {0} {1}::'.format(method, requesturl))
-        log.error('    Exception: {0}'.format(exc))
-        if exc.response:
-            log.error('    Response content: {0}'.format(exc.response.content))
-        return False
+    result = requests.request(method,
+                              requesturl,
+                              headers=headers,
+                              data=data,
+                              verify=verify_ssl)
+    response = result.content
+    if result.status_code >= 400:
+        # On error the S3 API response should contain error message
+        log.debug('    Response content: {0}'.format(response))
 
     log.debug('S3 Response Status Code: {0}'.format(result.status_code))