aliyun-log-python-sdk 0.9.14__tar.gz → 0.9.15__tar.gz

{aliyun_log_python_sdk-0.9.14/aliyun_log_python_sdk.egg-info → aliyun_log_python_sdk-0.9.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.14
+Version: 0.9.15
 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.14 → aliyun_log_python_sdk-0.9.15}/aliyun/log/logclient.py

@@ -1208,10 +1208,11 @@ class LogClient(object):
                                  count=batch_size, end_cursor=end_cursor, compress=compress, query=query)
 
             yield res
-            if res.get_log_count() <= 0:
+            next_cursor = res.get_next_cursor()
+            if end_cursor == next_cursor:
                 break
 
-            begin_cursor = res.get_next_cursor()
+            begin_cursor = next_cursor
 
     def pull_log_dump(self, project_name, logstore_name, from_time, to_time, file_path, batch_size=None,
                       compress=None, encodings=None, shard_list=None, no_escape=None, query=None):
@@ -5188,7 +5189,7 @@ class LogClient(object):
         Unsuccessful operation will cause an LogException.
 
         :type project_name: string
-        :param project_name: the Pqroject name
+        :param project_name: the project name
 
         :type offset: int
         :param offset: line offset of return logs
@@ -5211,6 +5212,39 @@ class LogClient(object):
         params['jobType'] = "Export"
         (resp, header) = self._send("GET", project_name, None, resource, params, headers)
         return ListExportResponse(resp, header)
+    
+    def list_logstore_export(self, project_name, logstore_name, offset=0, size=100):
+        """ list exports that belongs to the logstore
+        Unsuccessful operation will cause an LogException.
+
+        :type project_name: string
+        :param project_name: the project name
+
+        :type offset: int
+        :param offset: line offset of return logs
+
+        :type size: int
+        :param size: max line number of return logs, -1 means get all
+
+        :type logstore_name: string
+        :param logstore_name: logstore name, only list the export job that belongs to the logstore
+
+        :return: ListExportsResponse
+        :raise: LogException
+        """
+        # need to use extended method to get more
+        if int(size) == -1 or int(size) > MAX_LIST_PAGING_SIZE:
+            return list_more(self.list_logstore_export, int(offset), int(size), MAX_LIST_PAGING_SIZE,
+                             project_name, logstore_name)
+        headers = {}
+        params = {}
+        resource = '/jobs'
+        params['offset'] = str(offset)
+        params['size'] = str(size)
+        params['jobType'] = "Export"
+        params['logstore'] = logstore_name
+        (resp, header) = self._send("GET", project_name, None, resource, params, headers)
+        return ListExportResponse(resp, header)
 
     def list_alert(self, project, offset=0, size=100):
         """list alerts

{aliyun_log_python_sdk-0.9.14 → aliyun_log_python_sdk-0.9.15}/aliyun/log/machine_group_detail.py

@@ -76,3 +76,8 @@ class MachineStatus(object):
         self.machine_unique_id = machine_unique_id
         self.user_defined_id = user_defined_id
         self.heartbeat_time = heartbeat_time
+
+    def log_print(self):
+        print('MachineStatus: machine_unique_id={}, user_defined_id={}, heartbeat_time={}'.format(self.machine_unique_id,
+                                                                                                  self.user_defined_id,
+                                                                                                  self.heartbeat_time))

{aliyun_log_python_sdk-0.9.14 → aliyun_log_python_sdk-0.9.15}/aliyun/log/machinegroup_response.py

@@ -221,7 +221,9 @@ class ListMachinesResponse(LogResponse):
         print('headers:', self.get_all_headers())
         print('machine_count', self.count)
         print('machine_total', self.total)
-        print('machines:', self.machines)
+        print('machines:')
+        for machine in self.machines:
+            machine.log_print()
 
     def merge(self, response):
         if not isinstance(response, ListMachinesResponse):

{aliyun_log_python_sdk-0.9.14 → aliyun_log_python_sdk-0.9.15}/aliyun/log/version.py

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

{aliyun_log_python_sdk-0.9.14 → aliyun_log_python_sdk-0.9.15/aliyun_log_python_sdk.egg-info}/PKG-INFO

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