]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: Improve RestClient error logging 29794/head
authorVolker Theile <vtheile@suse.com>
Wed, 21 Aug 2019 12:50:55 +0000 (14:50 +0200)
committerVolker Theile <vtheile@suse.com>
Wed, 21 Aug 2019 13:35:39 +0000 (15:35 +0200)
Log the request URL for ConnectionError exceptions to allow a better error analysis of bug reports.

Signed-off-by: Volker Theile <vtheile@suse.com>
src/pybind/mgr/dashboard/rest_client.py

index e3f5dafc8209a164e87e581bdea74a471d85fd5c..d81b61c3a52478e70c71f5fb691e4a82a2520127 100644 (file)
@@ -436,8 +436,8 @@ class RestClient(object):
                     errno = "n/a"
                     strerror = "SSL error. Probably trying to access a non " \
                                "SSL connection."
-                    logger.error("%s REST API failed %s, SSL error.",
-                                 self.client_name, method.upper())
+                    logger.error("%s REST API failed %s, SSL error (url=%s).",
+                                 self.client_name, method.upper(), ex.request.url)
                 else:
                     try:
                         match = re.match(r'.*: \[Errno (-?\d+)\] (.+)',
@@ -448,20 +448,21 @@ class RestClient(object):
                         errno = match.group(1)
                         strerror = match.group(2)
                         logger.error(
-                            "%s REST API failed %s, connection error: "
+                            "%s REST API failed %s, connection error (url=%s): "
                             "[errno: %s] %s",
-                            self.client_name, method.upper(), errno, strerror)
+                            self.client_name, method.upper(), ex.request.url,
+                            errno, strerror)
                     else:
                         errno = "n/a"
                         strerror = "n/a"
                         logger.error(
-                            "%s REST API failed %s, connection error.",
-                            self.client_name, method.upper())
+                            "%s REST API failed %s, connection error (url=%s).",
+                            self.client_name, method.upper(), ex.request.url)
             else:
                 errno = "n/a"
                 strerror = "n/a"
-                logger.error("%s REST API failed %s, connection error.",
-                             self.client_name, method.upper())
+                logger.error("%s REST API failed %s, connection error (url=%s).",
+                             self.client_name, method.upper(), ex.request.url)
 
             if errno != "n/a":
                 ex_msg = (