aliyun-log-python-sdk 0.9.18__tar.gz → 0.9.21__tar.gz

{aliyun_log_python_sdk-0.9.18/aliyun_log_python_sdk.egg-info → aliyun_log_python_sdk-0.9.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.18
+Version: 0.9.21
 Summary: Aliyun log service Python client SDK
 Home-page: https://github.com/aliyun/aliyun-log-python-sdk
 Author: Aliyun

{aliyun_log_python_sdk-0.9.18 → aliyun_log_python_sdk-0.9.21}/aliyun/log/consumer/consumer_client.py

@@ -37,7 +37,44 @@ class ConsumerClient(object):
         self.logger = ConsumerClientLoggerAdapter(
             logging.getLogger(__name__), {"consumer_client": self})
 
-    def create_consumer_group(self, timeout, in_order):
+    def ensure_consumer_group_created(self, timeout, in_order):
+        exists, need_fallback = self._is_consumer_group_exist()
+        # fallback
+        if need_fallback:
+            self._ensure_consumer_group_created_legacy(timeout, in_order)
+            return
+
+        # try create
+        if not exists:
+            try:
+                self.mclient.create_consumer_group(self.mproject, self.mlogstore, self.mconsumer_group,
+                                                   timeout, in_order)
+                return
+            except LogException as e:
+                if e.get_error_code() != 'ConsumerGroupAlreadyExist':
+                    raise ClientWorkerException('error occour when create consumer group, errorCode: '
+                                                + e.get_error_code() + ", errorMessage: " + e.get_error_message())
+
+        # try update
+        try:
+
+            self.mclient.update_consumer_group(self.mproject, self.mlogstore, self.mconsumer_group,
+                                               timeout, in_order)
+        except LogException as e:
+            raise ClientWorkerException("error occour when update consumer group, errorCode: " +
+                                        e.get_error_code() + ", errorMessage: " + e.get_error_message())
+
+    def _is_consumer_group_exist(self):
+        # returns (exists, need_fallback)
+        try:
+            exist = (self.get_consumer_group() is not None)
+            return exist, False
+        except LogException as _:
+            return None, True
+
+
+    # fallback, for backward compatibility
+    def _ensure_consumer_group_created_legacy(self, timeout, in_order):
         try:
             self.mclient.create_consumer_group(self.mproject, self.mlogstore, self.mconsumer_group,
                                                timeout, in_order)

{aliyun_log_python_sdk-0.9.18 → aliyun_log_python_sdk-0.9.21}/aliyun/log/consumer/worker.py

@@ -44,7 +44,7 @@ class ConsumerWorker(Thread):
 
         self.last_owned_consumer_finish_time = 0
 
-        self.consumer_client.create_consumer_group(consumer_option.consumer_group_time_out, consumer_option.in_order)
+        self.consumer_client.ensure_consumer_group_created(consumer_option.consumer_group_time_out, consumer_option.in_order)
         self.heart_beat = ConsumerHeatBeat(self.consumer_client, consumer_option.heartbeat_interval,
                                            consumer_option.consumer_group_time_out)
 

{aliyun_log_python_sdk-0.9.18 → aliyun_log_python_sdk-0.9.21}/aliyun/log/logclient.py

@@ -166,6 +166,8 @@ class LogClient(object):
             self._auth = make_auth(StaticCredentialsProvider(accessKeyId, accessKey, securityToken),
                                    auth_version, region)
         self._get_logs_v2_enabled = True
+        self._session = requests.Session()
+        self._enable_keep_alive = True
 
     def _replace_credentials(self):
         delta = time.time() - self._last_refresh
@@ -248,10 +250,16 @@ class LogClient(object):
                                'Bad json format:\n"%s"' % resp_body + '\n' + repr(ex),
                                requestId, resp_status, resp_header, resp_body)
 
+    def _get_http_sender(self, method):
+        if self._enable_keep_alive:
+            return getattr(self._session, method.lower())
+        return getattr(requests, method.lower())
+        
     def _getHttpResponse(self, method, url, params, body, headers):  # ensure method, url, body is str
         try:
             headers['User-Agent'] = self._user_agent
-            r = getattr(requests, method.lower())(url, params=params, data=body, headers=headers, timeout=self._timeout)
+            http_sender = self._get_http_sender(method)
+            r = http_sender(url, params=params, data=body, headers=headers, timeout=self._timeout)
             return r.status_code, r.content, r.headers
         except Exception as ex:
             raise LogException('LogRequestError', str(ex))
@@ -274,6 +282,10 @@ class LogClient(object):
 
         exJson = self._loadJson(resp_status, resp_header, resp_body, requestId)
         exJson = Util.convert_unicode_to_str(exJson)
+        if exJson is None:
+            raise LogException('LogRequestError',
+                               'Request is failed, got None response while status code is ' + str(resp_status) + '.',
+                               requestId, resp_status, resp_header, resp_body)
 
         if 'errorCode' in exJson and 'errorMessage' in exJson:
             raise LogException(exJson['errorCode'], exJson['errorMessage'], requestId,

{aliyun_log_python_sdk-0.9.18 → aliyun_log_python_sdk-0.9.21}/aliyun/log/version.py

@@ -1,5 +1,4 @@
-__version__ = '0.9.18'
-
+__version__ = '0.9.21'
 
 import sys
 OS_VERSION = str(sys.platform)

{aliyun_log_python_sdk-0.9.18 → aliyun_log_python_sdk-0.9.21/aliyun_log_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.18
+Version: 0.9.21
 Summary: Aliyun log service Python client SDK
 Home-page: https://github.com/aliyun/aliyun-log-python-sdk
 Author: Aliyun