]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/telemetry: use raise_for_status() 33070/head
authorSage Weil <sage@redhat.com>
Wed, 5 Feb 2020 22:45:52 +0000 (16:45 -0600)
committerSage Weil <sage@redhat.com>
Wed, 5 Feb 2020 22:46:02 +0000 (16:46 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/telemetry/module.py

index 2d3a5bb2406b9e5a4da478927e4d91d56f3d8446..2ef7ccfb9a793bccc90c43a3fb9d52d21b6045d1 100644 (file)
@@ -666,23 +666,14 @@ class Module(MgrModule):
             self.log.info('Send using HTTP(S) proxy: %s', self.proxy)
             proxies['http'] = self.proxy
             proxies['https'] = self.proxy
-        fail_reason = None
         try:
             resp = requests.put(url=url, json=report)
-            if not resp.ok:
-                fail_reason = 'Failed to send %s to %s: %d %s %s' % (
-                    what,
-                    url,
-                    resp.status_code,
-                    resp.reason,
-                    resp.text
-                )
+            resp.raise_for_status()
         except Exception as e:
-            fail_reason = 'Failed to send %s to %s: %s' % (
-                what, url, str(e)))
-        if fail_reason:
+            fail_reason = 'Failed to send %s to %s: %s' % (what, url, str(e))
             self.log.error(fail_reason)
-        return fail_reason
+            return fail_reason
+        return None
 
     def send(self, report, endpoint=None):
         if not endpoint: