diff --git a/CHANGELOG.md b/CHANGELOG.md index d43c0d7..1d804a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +# Change Log + +1.3.2 + +- Added log level settings for both command and file output in dakota_interface.process + + +1.3.1 + +- Changed log level to 'info' for subprocess commands in analysis.run and presg.preSG + + 1.3.0 - Added logging and timing functions @@ -6,7 +18,6 @@ - Updated the readVABSOutHomo function for the latest VABS output format - 1.2.0 - Moved all scripts under an extra layer of directory 'msgpi' diff --git a/msgpi/analysis.py b/msgpi/analysis.py index 90d3f80..21f1ff2 100644 --- a/msgpi/analysis.py +++ b/msgpi/analysis.py @@ -239,7 +239,7 @@ def runSwiftComp( if reduced_integration: cmd.append('R') - logger.debug(' '.join(cmd)) + logger.info(' '.join(cmd)) if scrnout: sbp.call(cmd) diff --git a/msgpi/dakota_interface.py b/msgpi/dakota_interface.py index 98a8c36..4feccb3 100644 --- a/msgpi/dakota_interface.py +++ b/msgpi/dakota_interface.py @@ -8,13 +8,13 @@ import msgpi.analysis as sga import dakota.interfacing as di -def process(fn_json_args, logger=None): +def process(fn_json_args): # if logger is None: # logger = mlog.initLogger(__name__) # if timer is None: # timer = mtime.Timer(logger=logger.info) - print() + # print() # timer.start() # Load JSON arguments @@ -22,11 +22,19 @@ def process(fn_json_args, logger=None): interface_args = json.load(fo) # Set logger - log_level = 'INFO' - if 'log_level' in interface_args.keys(): - if interface_args['log_level'] == 'debug': - log_level = 'DEBUG' - logger = mlog.initLogger(__name__, cout_level=log_level) + log_level_cmd = 'INFO' + log_level_file = 'INFO' + log_file_name = 'log.txt' + if 'log_level_cmd' in interface_args.keys(): + log_level_cmd = interface_args['log_level_cmd'].upper() + if 'log_level_file' in interface_args.keys(): + log_level_file = interface_args['log_level_file'].upper() + if 'log_file_name' in interface_args.keys(): + log_file_name = interface_args['log_file_name'] + logger = mlog.initLogger( + __name__, + cout_level=log_level_cmd, fout_level=log_level_file, filename=log_file_name + ) # Load data processing module if 'data_process_functions_file' in interface_args.keys(): @@ -137,7 +145,7 @@ def process(fn_json_args, logger=None): results.write() # print(' - done.') - logger.info(evtag + ' done') + logger.critical(' '.join((evtag, 'finished'))) # timer.stop() return