fix log (TencentCloud#174)

sesky4 · web-flow · commit f10f81ecdff2 · 2024-01-26T10:19:40.000+08:00
* fix: log

* Update abstract_client.py
diff --git a/tencentcloud/common/abstract_client.py b/tencentcloud/common/abstract_client.py
@@ -34,7 +34,7 @@
 import tencentcloud
 from tencentcloud.common.exception.tencent_cloud_sdk_exception import TencentCloudSDKException
 from tencentcloud.common.exception import TencentCloudSDKException as SDKError
-from tencentcloud.common.http.request import ApiRequest
+from tencentcloud.common.http.request import ApiRequest, ResponsePrettyFormatter
 from tencentcloud.common.http.request import RequestInternal
 from tencentcloud.common.profile.client_profile import ClientProfile, RegionBreakerProfile
 from tencentcloud.common.sign import Sign
@@ -324,6 +324,7 @@ def _get_multipart_body(self, params, boundary, options=None):
 
     def _check_status(self, resp_inter):
         if resp_inter.status_code != 200:
+            logger.debug("GetResponse: %s", ResponsePrettyFormatter(resp_inter))
             raise TencentCloudSDKException("ServerNetworkError", resp_inter.content)
 
     def _format_sign_string(self, params):
@@ -354,6 +355,7 @@ def _check_error(self, resp):
             code = data["Response"]["Error"]["Code"]
             message = data["Response"]["Error"]["Message"]
             reqid = data["Response"]["RequestId"]
+            logger.debug("GetResponse: %s", ResponsePrettyFormatter(resp))
             raise TencentCloudSDKException(code, message, reqid)
         if "DeprecatedWarning" in data["Response"]:
             import warnings
@@ -363,6 +365,7 @@ def _check_error(self, resp):
 
     @staticmethod
     def _process_response_sse(resp):
+        logger.debug("GetResponse: %s", ResponsePrettyFormatter(resp, format_body=False))
         e = {}
 
         for line in resp.iter_lines():
@@ -371,6 +374,7 @@ def _process_response_sse(resp):
                 e = {}
                 continue
 
+            logger.debug("GetResponse: %s", line)
             line = line.decode('utf-8')
 
             # comment
@@ -409,6 +413,7 @@ def call(self, action, params, options=None, headers=None):
         resp = self._call(action, params, options, headers)
         self._check_status(resp)
         self._check_error(resp)
+        logger.debug("GetResponse: %s", ResponsePrettyFormatter(resp))
         return resp.content
 
     def _call_with_region_breaker(self, action, params, options=None, headers=None):
@@ -488,6 +493,7 @@ def call_json(self, action, params, headers=None, options=None):
         resp = self._call(action, params, options, headers)
         self._check_status(resp)
         self._check_error(resp)
+        logger.debug("GetResponse: %s", ResponsePrettyFormatter(resp))
         return json.loads(resp.content)
 
     def call_sse(self, action, params, headers=None, options=None):
diff --git a/tencentcloud/common/http/request.py b/tencentcloud/common/http/request.py
@@ -89,8 +89,7 @@ def _request(self, req_inter):
         url = self._handle_host(req_inter.host)
         if self.keep_alive:
             req_inter.header["Connection"] = "Keep-Alive"
-        if self.debug:
-            logger.debug("SendRequest %s" % req_inter)
+        logger.debug("SendRequest: %s" % req_inter)
         if req_inter.method == 'GET':
             req_inter_url = '%s?%s' % (url, req_inter.data)
             return self.conn.request(req_inter.method, req_inter_url,
@@ -106,7 +105,6 @@ def send_request(self, req_inter):
         try:
             http_resp = self._request(req_inter)
             self.request_size = self.conn.request_length
-            logger.debug("GetResponse %s" % http_resp)
             return http_resp
         except Exception as e:
             raise TencentCloudSDKException("ClientNetworkError", str(e))
@@ -126,3 +124,30 @@ def __str__(self):
         headers = "\n".join("%s: %s" % (k, v) for k, v in self.header.items())
         return ("Host: %s\nMethod: %s\nUri: %s\nHeader: %s\nData: %s\n"
                 % (self.host, self.method, self.uri, headers, self.data))
+
+
+class ResponsePrettyFormatter(object):
+    def __init__(self, resp, format_body=True, delimiter="\n"):
+        self._resp = resp
+        self._format_body = format_body
+        self._delimiter = delimiter
+
+    def __str__(self):
+        lines = ['%s %d %s' % (self.str_ver(self._resp.raw.version), self._resp.status_code, self._resp.reason)]
+        for k, v in self._resp.headers.items():
+            lines.append('%s: %s' % (k, v))
+        if self._format_body:
+            lines.append('')
+            lines.append(self._resp.text)
+        return self._delimiter.join(lines)
+
+    @staticmethod
+    def str_ver(ver):
+        if ver == 10:
+            return "HTTP/1.0"
+        elif ver == 11:
+            return "HTTP/1.1"
+        elif ver == 20:
+            return "HTTP/2.0"
+        else:
+            return str(ver)
