grouper_delta_user: Add log keyword option #57

Update user_update to pass log
UAL-RE · Sep 29, 2020 · d0283f9 · d0283f9
1 parent ab475aa
commit d0283f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/requiam/grouper_query.py b/requiam/grouper_query.py
@@ -4,6 +4,7 @@
 from .delta import Delta
 from .manual_override import update_entries
 from .commons import figshare_stem
+from .logger import log_stdout
 
 
 class GrouperQuery(object):
@@ -87,7 +88,7 @@ def figshare_group(group, root_stem, production=True):
 
 
 def grouper_delta_user(group, stem, netid, uaid, action,
-                       grouper_dict, delta_dict, log, production=True):
+                       grouper_dict, delta_dict, log=None, production=True):
     """
     Purpose:
       Construct a Delta object for addition/deletion based for a specified
@@ -111,15 +112,17 @@ def grouper_delta_user(group, stem, netid, uaid, action,
       For logging
     :param production: Bool to use production stem. Otherwise a stage/test is used. Default: True
 
-
     :return d: Delta object class
     """
 
+    if isinstance(log, type(None)):
+        log = log_stdout()
+
     grouper_query = figshare_group(group, stem, production=production)
     gq = GrouperQuery(**grouper_dict, grouper_group=grouper_query)
 
     member_set = gq.members
-    member_set = update_entries(member_set, netid, uaid, action, log)
+    member_set = update_entries(member_set, netid, uaid, action, log=log)
 
     d = Delta(ldap_members=member_set,
               grouper_query_instance=gq,

diff --git a/scripts/user_update b/scripts/user_update
@@ -262,7 +262,7 @@ if __name__ == '__main__':
             d = grouper_delta_user('active', '',
                                    current_dict['not_active']['netid'],
                                    set(current_dict['not_active']['uaid']),
-                                   'add', grouper_dict, delta_dict, log)
+                                   'add', grouper_dict, delta_dict, log=None)
 
             if args.sync:
                 log.info('synchronizing ...')
@@ -278,7 +278,7 @@ if __name__ == '__main__':
             d = grouper_delta_user('active', '',
                                    current_dict['active']['netid'],
                                    set(current_dict['active']['uaid']),
-                                   'remove', grouper_dict, delta_dict, log)
+                                   'remove', grouper_dict, delta_dict, log=None)
 
             if args.sync:
                 log.info('synchronizing ...')
@@ -306,7 +306,7 @@ if __name__ == '__main__':
 
                     d = grouper_delta_user(current_portal, 'portal',
                                            not_portal_netid[i], {not_portal_uaid[i]},
-                                           'remove', grouper_dict, delta_dict, log)
+                                           'remove', grouper_dict, delta_dict, log=None)
 
                     if args.sync:
                         log.info('synchronizing ...')
@@ -321,7 +321,7 @@ if __name__ == '__main__':
                 d = grouper_delta_user(vargs['portal'], 'portal',
                                        current_dict['not_portal']['netid'],
                                        current_dict['not_portal']['uaid'],
-                                       'add', grouper_dict, delta_dict, log)
+                                       'add', grouper_dict, delta_dict, log=None)
 
                 if args.sync:
                     log.info('synchronizing ...')
@@ -362,7 +362,7 @@ if __name__ == '__main__':
 
                     d = grouper_delta_user(current_quota, 'quota',
                                            not_quota_netid[i], {not_quota_uaid[i]},
-                                           'remove', grouper_dict, delta_dict, log)
+                                           'remove', grouper_dict, delta_dict, log=None)
 
                     if args.sync:
                         log.info('synchronizing ...')
@@ -377,7 +377,7 @@ if __name__ == '__main__':
                 d = grouper_delta_user(vargs['quota'], 'quota',
                                        current_dict['not_quota']['netid'],
                                        current_dict['not_quota']['uaid'],
-                                       'add', grouper_dict, delta_dict, log)
+                                       'add', grouper_dict, delta_dict, log=None)
 
                 if args.sync:
                     log.info('synchronizing ...')