LDAPConnection: Add log keyword option #57

Update script_run, user_update, get_org_code_numbers scripts
UAL-RE · Sep 29, 2020 · ab475aa · ab475aa
1 parent 4f84a6e
commit ab475aa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/requiam/ldap_query.py b/requiam/ldap_query.py
@@ -1,7 +1,6 @@
 import ldap3
-import logging
 
-logger = logging.getLogger(__name__)
+from .logger import log_stdout
 
 
 class LDAPConnection(object):
@@ -27,8 +26,12 @@ class LDAPConnection(object):
         members = ldap_query.ldap_search(ldc, portal_query)
     """
 
-    def __init__(self, ldap_host, ldap_base_dn, ldap_user, ldap_password):
-        logger.debug('entered')
+    def __init__(self, ldap_host, ldap_base_dn, ldap_user, ldap_password, log=None):
+
+        if isinstance(log, type(None)):
+            log = log_stdout()
+
+        log.debug('entered')
 
         #
         # set properties
@@ -49,7 +52,7 @@ def __init__(self, ldap_host, ldap_base_dn, ldap_user, ldap_password):
         self.ldc = ldap3.Connection(self.ldap_bind_host, self.ldap_bind_dn,
                                     self.ldap_password, auto_bind=True)
 
-        logger.debug('returning')
+        log.debug('returning')
 
 
 def uid_query(uid):

diff --git a/scripts/get_org_code_numbers b/scripts/get_org_code_numbers
@@ -109,7 +109,7 @@ if __name__ == '__main__':
     ldc = LDAPConnection(ldap_host=vargs['ldap_host'],
                          ldap_base_dn=vargs['ldap_base_dn'],
                          ldap_user=vargs['ldap_user'],
-                         ldap_password=vargs['ldap_password'])
+                         ldap_password=vargs['ldap_password'], log=log)
 
     get_numbers(ldc, vargs['org_url'], log)
 

diff --git a/scripts/script_run b/scripts/script_run
@@ -142,7 +142,8 @@ if __name__ == '__main__':
     ldc = ldap_query.LDAPConnection(ldap_host=vargs['ldap_host'],
                                     ldap_base_dn=vargs['ldap_base_dn'],
                                     ldap_user=vargs['ldap_user'],
-                                    ldap_password=vargs['ldap_password'])
+                                    ldap_password=vargs['ldap_password'],
+                                    log=log)
 
     grouper_dict = dict(grouper_host=vargs['grouper_host'],
                         grouper_base_path=vargs['grouper_base_path'],
@@ -192,7 +193,7 @@ if __name__ == '__main__':
             # Grouper query
             grouper_portal = grouper_query.figshare_group(portal, 'portal')
             gq = grouper_query.GrouperQuery(**grouper_dict,
-                                            grouper_group=grouper_portal)
+                                            grouper_group=grouper_portal, log=log)
             log.info(" Grouper size {}".format(len(gq.members)))
 
             d = delta.Delta(ldap_members=ldap_members,

diff --git a/scripts/user_update b/scripts/user_update
@@ -137,7 +137,7 @@ if __name__ == '__main__':
     mo = ManualOverride(vargs['portal_file'], vargs['quota_file'], log)
 
     # Initiate LDAP connection
-    ldc = ldap_query.LDAPConnection(**ldap_dict)
+    ldc = ldap_query.LDAPConnection(**ldap_dict, log=log)
 
     if '.txt' in vargs['netid'][-4:]:
         # Read in text file with list of users