Fix #8 and #118. Requires umapi-client v2.2.

* look for batch errors from the umapi-client, and mark the corresponding actions as processed.
* use the target and command data from the umapi-client to log action details together with error messages about execution.

Author: adobeDan

setup.py

@@ -43,7 +43,7 @@
           'pycrypto',
           'python-ldap==2.4.25',
           'PyYAML',
-          'umapi-client>=2.1',
+          'umapi-client>=2.2',
           'psutil',
       ],
       setup_requires=['nose>=1.0'],

user_sync/connector/dashboard.py

@@ -289,8 +289,14 @@ def _execute_action(self, action):
         '''
         :type action: umapi_client.UserAction
         '''
-        _, sent, _ = self.connection.execute_single(action)
-        self.process_sent_items(sent)
+        sent = 0
+        try:
+            _, sent, _ = self.connection.execute_single(action)
+        except umapi_client.BatchError as e:
+            self.logger.log(logging.CRITICAL, "Unexpected response! Actions may have failed: %s", e)
+            sent = e.statistics[1]
+        finally:
+            self.process_sent_items(sent)
 
     def process_sent_items(self, total_sent):
         if (total_sent > 0):
@@ -303,7 +309,10 @@ def process_sent_items(self, total_sent):
 
                 if (not is_success):
                     for error in action_errors:
-                        self.logger.error('Error requestID: %s code: "%s" message: "%s"', action.frame.get("requestID"), error.get('errorCode'), error.get('message'));
+                        self.logger.error('Error in requestID: %s (User: %s, Command: %s): code: "%s" message: "%s"',
+                                          action.frame.get("requestID"),
+                                          error.get("target", "<Unknown>"), error.get("command", "<Unknown>"),
+                                          error.get('errorCode', "<None>"), error.get('message', "<None>"))
 
                 item_callback = sent_item['callback']
                 if (callable(item_callback)):
@@ -314,7 +323,11 @@ def process_sent_items(self, total_sent):
                     })
 
     def flush(self):
-        _, sent, _ = self.connection.execute_queued()
-        self.process_sent_items(sent)
-        
-
+        sent = 0
+        try:
+            _, sent, _ = self.connection.execute_queued()
+        except umapi_client.BatchError as e:
+            self.logger.log(logging.CRITICAL, "Unexpected response! Actions may have failed: %s", e)
+            sent = e.statistics[1]
+        finally:
+            self.process_sent_items(sent)