diff --git a/DataRepository_patrons/script_run b/DataRepository_patrons/script_run index dd2e6852..25a99c79 100644 --- a/DataRepository_patrons/script_run +++ b/DataRepository_patrons/script_run @@ -53,6 +53,8 @@ if __name__ == '__main__': log = LogClass(log_dir, logfile).get_logger() + log.info("Started script_run") + cred_err = 0 vargs = vars(args) for p in ['ldap_host', 'ldap_base_dn', 'ldap_user', 'ldap_password', @@ -69,20 +71,20 @@ if __name__ == '__main__': if p in ['ldap_user', 'ldap_password', 'grouper_user', 'grouper_password']: if vargs[p] is '(unset)': - print(' {0: >17} = (unset)'.format(p)) + log.info(' {0: >17} = (unset)'.format(p)) cred_err += 1 else: - print(' {0: >17} = (set)'.format(p)) + log.info(' {0: >17} = (set)'.format(p)) else: - print(' {0: >17} = {1:}'. format(p, vargs[p])) + log.info(' {0: >17} = {1:}'. format(p, vargs[p])) if cred_err: - print("Not all credentials available!") - print("Exiting") + log.warning("Not all credentials available!") + log.warning("Exiting") raise ValueError - print(' sync = %s', args.sync) - print(' debug = %s', args.debug) + log.info(' sync = %s', args.sync) + log.info(' debug = %s', args.debug) # Read in CSV file csv_url = config.get('global', 'csv_url') @@ -99,19 +101,19 @@ if __name__ == '__main__': # Loop over sub-portals if args.portal: for portal in unique_portals: - print("Working on {} portal".format(portal)) + log.info("Working on {} portal".format(portal)) df_sub = df.loc[df['Sub-portals'] == portal] print(df_sub) # Get list of org codes for [portal] org_code_list = df_sub['Org Code'] - print("Org codes: {}".format(", ".join(org_code_list))) + log.info("Org codes: {}".format(", ".join(org_code_list))) # LDAP query to retrieve members ldap_queries = ldap_query.ual_ldap_queries(org_code_list) ldap_members = ldap_query.ldap_search(ldc, ldap_queries) - print(" EDS size {}".format(len(ldap_members))) + log.info(" EDS size {}".format(len(ldap_members))) # Grouper query grouper_portal = grouper_query.figshare_group(portal, 'portal') @@ -120,7 +122,7 @@ if __name__ == '__main__': grouper_user=vargs['grouper_user'], grouper_password=vargs['grouper_password'], grouper_group=grouper_portal) - print(" Grouper size {}".format(len(gq.members))) + log.info(" Grouper size {}".format(len(gq.members))) d = delta.Delta(ldap_members=ldap_members, grouper_query_instance=gq, @@ -129,13 +131,14 @@ if __name__ == '__main__': batch_delay=int(vargs['batch_delay']), sync_max=int(vargs['sync_max'])) - print('ldap and grouper have {} members in common'.format(len(d.common))) - print('synchronization will drop {} entries from grouper group'.format(len(d.drops))) - print('synchronization will add {} entries to grouper group'.format(len(d.adds))) + log.info('ldap and grouper have {} members in common'.format(len(d.common))) + log.info('synchronization will drop {} entries from grouper group'.format(len(d.drops))) + log.info('synchronization will add {} entries to grouper group'.format(len(d.adds))) if args.sync: - print('synchronizing ...') + log.info('synchronizing ...') d.synchronize() else: - print('dry run, not performing synchronization') + log.info('dry run, not performing synchronization') + log.info("Completed script_run successfully!") \ No newline at end of file