diff --git a/aosstower/level_b1/nc.py b/aosstower/level_b1/nc.py index 2f9e2703d2fe98e39b4ae72a096851c483d463ad..fe2d3204fc07ffc33163548b5904183294c569cf 100644 --- a/aosstower/level_b1/nc.py +++ b/aosstower/level_b1/nc.py @@ -464,13 +464,15 @@ def _dt_convert(datetime_str): def main(): import argparse + from metobscommon.archive import setup_logging parser = argparse.ArgumentParser(description="Convert level_00 aoss tower data to level_b1", fromfile_prefix_chars='@') parser.add_argument('-v', '--verbose', action="count", default=int(os.environ.get("VERBOSITY", 2)), dest='verbosity', help='each occurrence increases verbosity 1 level through ERROR-WARNING-INFO-DEBUG (default INFO)') - + parser.add_argument('-l', '--log-file', dest="log_filepath", + help="Alternate name for log file, default is to not create a file") parser.add_argument('-s', '--start-time', type=_dt_convert, help="Start time of massive netcdf file, if only -s is given, a netcdf file for only that day is given" + ". Formats allowed: \'YYYY-MM-DDTHH:MM:SS\', \'YYYY-MM-DD\'") @@ -502,8 +504,7 @@ each input file is mapped to the corresponding output file. args = parser.parse_args() levels = [logging.ERROR, logging.WARN, logging.INFO, logging.DEBUG] - level = levels[min(3, args.verbosity)] - logging.basicConfig(level=level) + setup_logging(args.log_filepath, level=levels[min(3, args.verbosity)]) if args.start_time and not args.end_time: args.end_time = args.start_time.replace(hour=23, minute=59, second=59) diff --git a/aosstower/level_b1/quicklook.py b/aosstower/level_b1/quicklook.py index cb1e6e7b844d91afe109ec433312f2c5c0579c24..ae5bc95617074afaf2fd80f20fad11a522f830e5 100644 --- a/aosstower/level_b1/quicklook.py +++ b/aosstower/level_b1/quicklook.py @@ -1,3 +1,6 @@ +import matplotlib +matplotlib.use('agg') + import os import sys from datetime import datetime, timedelta @@ -458,12 +461,15 @@ def _dt_convert(datetime_str): def main(): import argparse + from metobscommon.archive import setup_logging parser = argparse.ArgumentParser(description="Use data from level_b1 netCDF files to create netCDF files") parser.add_argument('-v', '--verbose', action='count', default=int(os.environ.get("VERBOSITY", 2)), dest='verbosity', help=('each occurence increases verbosity 1 level through' + ' ERROR-WARNING-INFO-DEBUG (default INFO)')) + parser.add_argument('-l', '--log-file', dest="log_filepath", + help="Alternate name for log file, default is to not create a file") parser.add_argument('-s', '--start-time', type=_dt_convert, help="Start time of plot. If only -s is given, a plot of " + "only that day is created. Formats allowed: \'YYYY-MM-DDTHH:MM:SS\', \'YYYY-MM-DD\'") @@ -484,8 +490,7 @@ def main(): args = parser.parse_args() levels = [logging.ERROR, logging.WARN, logging.INFO, logging.DEBUG] - level = levels[min(3, args.verbosity)] - logging.basicConfig(level=level) + setup_logging(args.log_filepath, level=levels[min(3, args.verbosity)]) if not os.path.splitext(args.output)[-1]: LOG.warning("File pattern provided does not have a file extension") diff --git a/scripts/run_tower_level_b1.sh b/scripts/run_tower_level_b1.sh index 67acc27398ad87f14b9721a37999acb7493e004c..3a397c077942ee2db5e753b6c14d2dac8ff484b5 100755 --- a/scripts/run_tower_level_b1.sh +++ b/scripts/run_tower_level_b1.sh @@ -39,7 +39,8 @@ fi out_file=`cache_level_b1_file "$DATE"` out_fn=`basename "$out_file"` tmp_out="$tmp_dir/$out_fn" - $ENV/bin/python -m aosstower.level_b1.nc -vv -z -i "$prev_file" "$curr_file" -s "${DATE}" -o "$tmp_out" >> $logfile + log_info "Generating NetCDF files..." + $ENV/bin/python -m aosstower.level_b1.nc -l "$logfile" -vv -z -i "$prev_file" "$curr_file" -s "${DATE}" -o "$tmp_out" >> $logfile nc_status=$? if [ $nc_status -ne 0 ]; then oops "NetCDF generation failed for $DATE" @@ -50,7 +51,8 @@ fi ### Quicklook Generation ### # assumes that out_file is what the archive script wrote the file as - $ENV/bin/python -m aosstower.level_b1.quicklook -vv --thumbnail -s "$DATE" "$out_file" -o "$tmp_dir/aoss_tower.{plot_name}.{start_time:%Y-%m-%d}.png" -p meteorogram td pressure wind_speed wind_dir accum_precip solar_flux + log_info "Generating Quicklook images..." + $ENV/bin/python -m aosstower.level_b1.quicklook -l "$logfile" -vv --thumbnail -s "$DATE" "$out_file" -o "$tmp_dir/aoss_tower.{plot_name}.{start_time:%Y-%m-%d}.png" -p meteorogram td pressure wind_speed wind_dir accum_precip solar_flux quicklook_status=$? if [ $quicklook_status -ne 0 ]; then oops "Quicklook generation failed for $DATE"