Merge pull request #773 from adobe-apiplatform/feature/signals

Set start signals on GET batches and all POST batches

Author: adorton-adobe

setup.py

@@ -52,7 +52,7 @@
           'ldap3',
           'PyYAML',
           'six',
-          'umapi-client==2.18',
+          'umapi-client==2.19',
           'click',
           'click-default-group',
           'configparser==3.7.4',

user_sync/connector/connector_umapi.py

@@ -132,6 +132,7 @@ def iter_users(self, in_group=None):
         page_size = 0
         page_number = 0
         try:
+            self.connection.start_sync()
             u_query = umapi_client.UsersQuery(self.connection, in_group=in_group)
             for i, u in enumerate(u_query):
                 total_count, page_count, page_size, page_number = u_query.stats()
@@ -142,6 +143,8 @@ def iter_users(self, in_group=None):
 
                 if (i + 1) % page_size == 0:
                     self.logger.progress(len(users), total_count)
+                if page_number == page_count-2:
+                    self.connection.end_sync()
             self.logger.progress(total_count, total_count)
 
         except umapi_client.UnavailableError as e:

user_sync/engine/umapi.py

@@ -538,10 +538,10 @@ def execute_commands(self, command_list, connector):
 
         total_users = len(command_list)
 
-        # split off the last command if we have more than 10, so we can send the signals
+        # split off the last command if we have more than 10, so we can send an end signal
+        connector.start_sync()
         if len(command_list) > 10:
             command_list, last_command = command_list[0:-1], command_list[-1]
-            connector.start_sync()
         else:
             last_command = None