From 7fa80056a754ccd7b3a1ba847d3506d1c5b0e96c Mon Sep 17 00:00:00 2001 From: Chun Ly Date: Mon, 28 Sep 2020 15:13:08 -0700 Subject: [PATCH] Add persistent path to scripts #56 Use f-strings for log filenames --- scripts/add_grouper_groups | 7 ++++--- scripts/get_org_code_numbers | 4 +++- scripts/script_run | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/add_grouper_groups b/scripts/add_grouper_groups index b9041bd0..83ad8c9d 100644 --- a/scripts/add_grouper_groups +++ b/scripts/add_grouper_groups @@ -101,6 +101,7 @@ if __name__ == '__main__': # Parse command-line arguments parser = argparse.ArgumentParser(description='Command-line driver to add a Grouper group.') parser.add_argument('--config', required=True, help='path to configuration file') + parser.add_argument('--persistent_path', required=True, help='full parent path for logs') parser.add_argument('--grouper_host', help='Grouper host') parser.add_argument('--grouper_base_path', help='base path for Grouper API') parser.add_argument('--grouper_user', help='user name for Grouper login') @@ -137,11 +138,11 @@ if __name__ == '__main__': config.read(args.config) # Define logfile - log_dir = config.get('global', 'log_dir') + log_dir = path.join(args.persistent_path, config.get('global', 'log_dir')) + if not path.exists(log_dir): mkdir(log_dir) - logfile_prefix = config.get('global', 'logfile_prefix') - logfile = f"add_groups.{today.strftime('%Y-%m-%d')}.log" + logfile = f"add_grouper_groups.{today.strftime('%Y-%m-%d')}.log" log = LogClass(log_dir, logfile).get_logger() diff --git a/scripts/get_org_code_numbers b/scripts/get_org_code_numbers index 38678d23..420f525a 100644 --- a/scripts/get_org_code_numbers +++ b/scripts/get_org_code_numbers @@ -29,6 +29,7 @@ library_root_path = path.dirname(path.dirname(library_path)) # Retrieve parent if __name__ == '__main__': parser = argparse.ArgumentParser(description='Command-line driver for Organization Code summary information.') parser.add_argument('--config', required=True, help='path to configuration file') + parser.add_argument('--persistent_path', required=True, help='full parent path for logs') parser.add_argument('--ldap_host', help='LDAP host') parser.add_argument('--ldap_base_dn', help='base DN for LDAP bind and query') parser.add_argument('--ldap_user', help='user name for LDAP login') @@ -57,7 +58,8 @@ if __name__ == '__main__': config.read(args.config) # Define logfile - log_dir = config.get('global', 'log_dir') + log_dir = path.join(args.persistent_path, config.get('global', 'log_dir')) + if not path.exists(log_dir): mkdir(log_dir) logfile = "org_code_numbers.{}.log".format(today.strftime("%Y-%m-%d")) diff --git a/scripts/script_run b/scripts/script_run index 497f669b..5f9c99b3 100644 --- a/scripts/script_run +++ b/scripts/script_run @@ -84,7 +84,7 @@ if __name__ == '__main__': if not path.exists(log_dir): mkdir(log_dir) logfile_prefix = config.get('global', 'logfile_prefix') - logfile = "{}.{}.log".format(logfile_prefix, today.strftime("%Y-%m-%d")) + logfile = f'{logfile_prefix}.{today.strftime("%Y-%m-%d")}.log' log = LogClass(log_dir, logfile).get_logger()