Changeset 1261

Timestamp:

May 10, 2022, 10:58:52 AM (3 years ago)

Author:

joergs

Message:

extend summary message

Location:

dassldapsync

Files:

• dassldapsync.conf (modified) (1 diff)
• dassldapsync.py (modified) (6 diffs)

dassldapsync/dassldapsync.conf

@@ -9 +9 @@
 #bindPassword=secret
 #filter=(objectclass=*)
+#excludesubtree=ou=unimportant,dc=example,dc=com
 #attributes=*
 #starttls=true

dassldapsync/dassldapsync.py

@@ -105 +105 @@
     def reset_result(self):
         self.result = {
+            'unmodified': {'ok': [], 'failed': []},
+            'excluded': {'ok': [], 'failed': []},
             'add': {'ok': [], 'failed': []},
             'update': {'ok': [], 'failed': []},
@@ -149 +151 @@
             d = ldap.cidict.cidict(r[1])
 
-            if self.__is_dn_included(dn):
+            if not self.__is_dn_included(dn):
+                self.notify_excluded(dn)
+            else:
                 objectclasses = d["objectclass"]
 
@@ -280 +284 @@
 
     def __syncLdapDestination(self, update_objects):
-
         logger.debug("writing data to destination LDAP")
         for obj in update_objects:
@@ -339 +342 @@
             ok = len(result[action]['ok'])
             failed = len(result[action]['failed'])
-            print("{} (ok: {}, failed: {}):".format(action, ok, failed))
-
-            if show_ok and ok > 0:
+            print("{} (ok: {}, failed: {})".format(action, ok, failed))
+
+            if ok > 0 and (show_ok or ok <= 3):
                 print("succeeded:")
                 print("\n".join(result[action]['ok']))
 
-            if show_failed and failed > 0:
+            if failed > 0 and (show_failed or failed <= 3):
                 print("failed:")
                 print("\n".join(result[action]['failed']))
+            print()
 
     def get_short_dn(self, dn):
@@ -353 +357 @@
 
     def notify_unchanged(self, dn):
-        logger.debug(u'{} unchanged'.format(self.get_short_dn(dn)))
+        #logger.debug(u'{} unchanged'.format(self.get_short_dn(dn)))
+        self.result['unmodified']['ok'].append(dn)
+
+    def notify_excluded(self, dn):
+        #logger.debug(u'{} unchanged'.format(self.get_short_dn(dn)))
+        self.result['excluded']['ok'].append(dn)
 
     def notify_created(self, dn, ok=True):
@@ -566 +575 @@
     conffile = args.configfile
 
-    exclude = None
-
     config = ConfigParser()
     config.read(conffile)