Merge pull request #46 from Sytten/master

Fix exception inheritance and wrong message
m0nhawk · Sep 17, 2019 · 4723b3a · 4723b3a
2 parents badb7c0 + d5c0522
commit 4723b3a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/grafana_api/grafana_api.py b/grafana_api/grafana_api.py
@@ -6,15 +6,15 @@ class GrafanaException(Exception):
     pass
 
 
-class GrafanaServerError(Exception):
+class GrafanaServerError(GrafanaException):
     """
     5xx
     """
 
     pass
 
 
-class GrafanaClientError(Exception):
+class GrafanaClientError(GrafanaException):
     """
     Invalid input (4xx errors)
     """
@@ -98,7 +98,7 @@ def __request_runnner(url, json=None, headers=None):
             )
             if 500 <= r.status_code < 600:
                 raise GrafanaServerError(
-                    "Client Error {0}: {1}".format(r.status_code, r.json()['message'])
+                    "Server Error {0}: {1}".format(r.status_code, r.json()['message'])
                 )
             elif r.status_code == 400:
                 raise GrafanaBadInputError("Bad Input: `{0}`".format(r.text))