Add Exception Handle For Object Select

Author: tiedu

qcloud_cos/cos_client.py

@@ -237,7 +237,7 @@ def send_request(self, method, url, bucket, timeout=30, **kwargs):
         for j in range(self._retry + 1):
             try:
                 if j != 0:
-                    time.sleep(1)
+                    time.sleep(j)
                 if method == 'POST':
                     res = self._session.post(url, timeout=timeout, proxies=self._conf._proxies, **kwargs)
                 elif method == 'GET':

qcloud_cos/cos_exception.py

@@ -5,7 +5,10 @@
 
 class CosException(Exception):
     def __init__(self, message):
-        Exception.__init__(self, message)
+        self._message = message
+
+    def __str__(self):
+        return str(self._message)
 
 
 def digest_xml(data):
@@ -46,14 +49,17 @@ class CosServiceError(CosException):
     """COS Server端错误，可以获取特定的错误信息"""
     def __init__(self, method, message, status_code):
         CosException.__init__(self, message)
-        if method == 'HEAD':  # 对HEAD进行特殊处理
+        if isinstance(message, dict):
             self._origin_msg = ''
             self._digest_msg = message
         else:
             self._origin_msg = message
             self._digest_msg = digest_xml(message)
         self._status_code = status_code
 
+    def __str__(self):
+        return str(self._digest_msg)
+
     def get_origin_msg(self):
         """获取原始的XML格式错误信息"""
         return self._origin_msg

qcloud_cos/select_event_stream.py

@@ -2,8 +2,12 @@
 import os
 import uuid
 import struct
+import logging
 from .cos_comm import xml_to_dict
 from .cos_comm import to_unicode
+from .cos_exception import CosServiceError
+
+logger = logging.getLogger(__name__)
 
 
 class EventStream():
@@ -23,6 +27,8 @@ def __next__(self):
     def next_event(self):
         """获取下一个事件"""
         if self._finish:
+            """要把剩下的内容读完丢弃或者自己关连接,否则不会自动关连接"""
+            self._raw.read()
             raise StopIteration
         total_byte_length = struct.unpack('>I', bytes(self._raw.read(4)))[0]  # message总长度
         header_byte_length = struct.unpack('>I', bytes(self._raw.read(4)))[0]  # header总长度
@@ -54,6 +60,21 @@ def next_event(self):
             elif ':event-type' in msg_headers and msg_headers[':event-type'] == "End":
                 self._finish = True
                 return {'End': {}}
+        # 处理Error Message(抛出异常)
+        if ':message-type' in msg_headers and msg_headers[':message-type'] == 'error':
+            error_info = dict()
+            error_info['code'] = msg_headers[':error-code']
+            error_info['message'] = msg_headers[':error-message']
+            error_info['resource'] = self._rt.request.url
+            error_info['requestid'] = ''
+            error_info['traceid'] = ''
+            if 'x-cos-request-id' in self._rt.headers:
+                error_info['requestid'] = self._rt.headers['x-cos-request-id']
+            if 'x-cos-trace-id' in self._rt.headers:
+                error_info['traceid'] = self._rt.headers['x-cos-trace-id']
+            logger.error(error_info)
+            e = CosServiceError('POST', error_info, self._rt.status_code)
+            raise e
 
     def get_select_result(self):
         """获取查询结果"""