From 5429fe1eb64aa1f4795fc4f3cff65da3a3773704 Mon Sep 17 00:00:00 2001 From: Matthew Bourque Date: Fri, 22 Jun 2018 14:57:27 -0400 Subject: [PATCH 1/2] Changed default verbose option from True to False. --- jwql/permissions/permissions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jwql/permissions/permissions.py b/jwql/permissions/permissions.py index 362af5077..81f576dec 100644 --- a/jwql/permissions/permissions.py +++ b/jwql/permissions/permissions.py @@ -159,7 +159,7 @@ def has_permissions(pathname, owner=DEFAULT_OWNER, mode=DEFAULT_MODE, group=DEFA return True -def set_permissions(pathname, owner=DEFAULT_OWNER, mode=DEFAULT_MODE, group=DEFAULT_GROUP, verbose=True): +def set_permissions(pathname, owner=DEFAULT_OWNER, mode=DEFAULT_MODE, group=DEFAULT_GROUP, verbose=False): """Set mode and group of the file/directory identfied by ``pathname``, if and only if it is owned by ``owner``. From e0867a0a2974fdb7c8f1d429b6ce7b2727cac4dc Mon Sep 17 00:00:00 2001 From: Matthew Bourque Date: Fri, 22 Jun 2018 15:01:13 -0400 Subject: [PATCH 2/2] Removed explicit calls to verbose option in set_permissions as they are no longer needed after change to default behavior. --- jwql/dbmonitor/dbmonitor.py | 2 +- jwql/logging/logging_functions.py | 2 +- jwql/monitor_filesystem/monitor_filesystem.py | 8 ++++---- jwql/preview_image/generate_preview_images.py | 4 ++-- jwql/preview_image/preview_image.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jwql/dbmonitor/dbmonitor.py b/jwql/dbmonitor/dbmonitor.py index 5ed0a9654..fd680e1d1 100644 --- a/jwql/dbmonitor/dbmonitor.py +++ b/jwql/dbmonitor/dbmonitor.py @@ -199,6 +199,6 @@ def jwst_inventory(instruments=JWST_INSTRUMENTS, outfile = os.path.join(get_config()['outputs'], 'database_monitor', output_filename) output_file(outfile) save(plt) - set_permissions(outfile, verbose=False) + set_permissions(outfile) return table, keywords diff --git a/jwql/logging/logging_functions.py b/jwql/logging/logging_functions.py index a7666d717..d4c79f6e1 100644 --- a/jwql/logging/logging_functions.py +++ b/jwql/logging/logging_functions.py @@ -101,7 +101,7 @@ def configure_logging(module, production_mode=True, path='./'): format='%(asctime)s %(levelname)s: %(message)s', datefmt='%m/%d/%Y %H:%M:%S %p', level=logging.INFO) - set_permissions(log_file, verbose=False) + set_permissions(log_file) def make_log_file(module, production_mode=True, path='./'): diff --git a/jwql/monitor_filesystem/monitor_filesystem.py b/jwql/monitor_filesystem/monitor_filesystem.py index a12a76c8a..e61054d27 100755 --- a/jwql/monitor_filesystem/monitor_filesystem.py +++ b/jwql/monitor_filesystem/monitor_filesystem.py @@ -114,7 +114,7 @@ def filesystem_monitor(): with open(statsfile, "a+") as f: f.write("{0} {1:15d} {2:15d} {3:15d} {4:15d} {5}\n".format(now, results_dict['file_count'], total, available, used, percent_used)) - set_permissions(statsfile, verbose=False) + set_permissions(statsfile) # set up and read out stats on files by type filesbytype = os.path.join(outputs_dir, 'filesbytype.txt') @@ -122,7 +122,7 @@ def filesystem_monitor(): f2.write("{0} {1} {2} {3} {4} {5}\n".format(results_dict['fits_files'], results_dict['uncal'], results_dict['cal'], results_dict['rate'], results_dict['rateints'], results_dict['i2d'])) - set_permissions(filesbytype, verbose=False) + set_permissions(filesbytype) # set up file size by type file sizebytype = os.path.join(outputs_dir, 'sizebytype.txt') @@ -130,7 +130,7 @@ def filesystem_monitor(): f3.write("{0} {1} {2} {3} {4} {5}\n".format(size_dict['size_fits'], size_dict['uncal'], size_dict['cal'], size_dict['rate'], size_dict['rateints'], size_dict['i2d'])) - set_permissions(sizebytype, verbose=False) + set_permissions(sizebytype) def plot_system_stats(stats_file, filebytype, sizebytype): @@ -235,7 +235,7 @@ def plot_system_stats(stats_file, filebytype, sizebytype): outfile = os.path.join(outputs_dir, "filesystem_monitor.html") output_file(outfile) save(grid) - set_permissions(outfile, verbose=False) + set_permissions(outfile) if __name__ == '__main__': diff --git a/jwql/preview_image/generate_preview_images.py b/jwql/preview_image/generate_preview_images.py index 43cc60053..d2482e47f 100644 --- a/jwql/preview_image/generate_preview_images.py +++ b/jwql/preview_image/generate_preview_images.py @@ -56,10 +56,10 @@ def generate_preview_images(): # Create the output directories if necessary if not os.path.exists(output_directory): os.makedirs(output_directory) - permissions.set_permissions(output_directory, verbose=False) + permissions.set_permissions(output_directory) if not os.path.exists(thumbnail_output_directory): os.makedirs(thumbnail_output_directory) - permissions.set_permissions(thumbnail_output_directory, verbose=False) + permissions.set_permissions(thumbnail_output_directory) # Create and save the preview image and thumbnail args = zip((False, True), (output_directory, thumbnail_output_directory)) diff --git a/jwql/preview_image/preview_image.py b/jwql/preview_image/preview_image.py index e9ad2b481..de407cdc2 100755 --- a/jwql/preview_image/preview_image.py +++ b/jwql/preview_image/preview_image.py @@ -319,7 +319,7 @@ def save_image(self, outfile): """ plt.savefig(outfile, bbox_inches='tight', pad_inches=0) - permissions.set_permissions(outfile, verbose=False) + permissions.set_permissions(outfile) # If the image is a thumbnail, rename to '.thumb' if self.thumbnail: