diff --git a/ambe_audio.py b/ambe_audio.py index c2246a7..9186963 100755 --- a/ambe_audio.py +++ b/ambe_audio.py @@ -636,6 +636,8 @@ if __name__ == '__main__': # CLI argument parser - handles picking up the config file from the command line, and sending a "help" message parser = argparse.ArgumentParser() parser.add_argument('-c', '--config', action='store', dest='CFG_FILE', help='/full/path/to/config.file (usually dmrlink.cfg)') + parser.add_argument('-ll', '--log_level', action='store', dest='LOG_LEVEL', help='Override config file logging level.') + parser.add_argument('-lh', '--log_handle', action='store', dest='LOG_HANDLERS', help='Override config file logging handler.') cli_args = parser.parse_args() if not cli_args.CFG_FILE: @@ -645,6 +647,10 @@ if __name__ == '__main__': CONFIG = dmrlink_config.build_config(cli_args.CFG_FILE) # Call the external routing to start the system logger + if cli_args.LOG_LEVEL: + CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL + if cli_args.LOG_HANDLERS: + CONFIG['LOGGER']['LOG_HANDLERS'] = cli_args.LOG_HANDLERS logger = dmrlink_log.config_logging(CONFIG['LOGGER']) logger.info('DMRlink \'ambe_audio.py\' (c) 2015 N0MJS & the K0USY Group - SYSTEM STARTING...') diff --git a/bridge.py b/bridge.py index eafd2ab..c7431ca 100755 --- a/bridge.py +++ b/bridge.py @@ -454,14 +454,23 @@ if __name__ == '__main__': # CLI argument parser - handles picking up the config file from the command line, and sending a "help" message parser = argparse.ArgumentParser() parser.add_argument('-c', '--config', action='store', dest='CFG_FILE', help='/full/path/to/config.file (usually dmrlink.cfg)') + parser.add_argument('-ll', '--log_level', action='store', dest='LOG_LEVEL', help='Override config file logging level.') + parser.add_argument('-lh', '--log_handle', action='store', dest='LOG_HANDLERS', help='Override config file logging handler.') cli_args = parser.parse_args() if not cli_args.CFG_FILE: cli_args.CFG_FILE = os.path.dirname(os.path.abspath(__file__))+'/dmrlink.cfg' - + # Call the external routine to build the configuration dictionary CONFIG = dmrlink_config.build_config(cli_args.CFG_FILE) - + + # Call the external routing to start the system logger + if cli_args.LOG_LEVEL: + CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL + if cli_args.LOG_HANDLERS: + CONFIG['LOGGER']['LOG_HANDLERS'] = cli_args.LOG_HANDLERS + logger = dmrlink_log.config_logging(CONFIG['LOGGER']) + # Call the external routing to start the system logger logger = dmrlink_log.config_logging(CONFIG['LOGGER']) @@ -510,4 +519,4 @@ if __name__ == '__main__': rule_timer = task.LoopingCall(rule_timer_loop) rule_timer.start(60) - reactor.run() \ No newline at end of file + reactor.run() diff --git a/confbridge.py b/confbridge.py index 294e209..4bc6cfb 100755 --- a/confbridge.py +++ b/confbridge.py @@ -382,15 +382,21 @@ if __name__ == '__main__': # CLI argument parser - handles picking up the config file from the command line, and sending a "help" message parser = argparse.ArgumentParser() parser.add_argument('-c', '--config', action='store', dest='CFG_FILE', help='/full/path/to/config.file (usually dmrlink.cfg)') + parser.add_argument('-ll', '--log_level', action='store', dest='LOG_LEVEL', help='Override config file logging level.') + parser.add_argument('-lh', '--log_handle', action='store', dest='LOG_HANDLERS', help='Override config file logging handler.') cli_args = parser.parse_args() if not cli_args.CFG_FILE: cli_args.CFG_FILE = os.path.dirname(os.path.abspath(__file__))+'/dmrlink.cfg' - + # Call the external routine to build the configuration dictionary CONFIG = dmrlink_config.build_config(cli_args.CFG_FILE) - + # Call the external routing to start the system logger + if cli_args.LOG_LEVEL: + CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL + if cli_args.LOG_HANDLERS: + CONFIG['LOGGER']['LOG_HANDLERS'] = cli_args.LOG_HANDLERS logger = dmrlink_log.config_logging(CONFIG['LOGGER']) config_reports(CONFIG) diff --git a/dmrlink.py b/dmrlink.py index 9731f08..2d505ca 100755 --- a/dmrlink.py +++ b/dmrlink.py @@ -940,6 +940,8 @@ if __name__ == '__main__': # CLI argument parser - handles picking up the config file from the command line, and sending a "help" message parser = argparse.ArgumentParser() parser.add_argument('-c', '--config', action='store', dest='CFG_FILE', help='/full/path/to/config.file (usually dmrlink.cfg)') + parser.add_argument('-ll', '--log_level', action='store', dest='LOG_LEVEL', help='Override config file logging level.') + parser.add_argument('-lh', '--log_handle', action='store', dest='LOG_HANDLERS', help='Override config file logging handler.') cli_args = parser.parse_args() if not cli_args.CFG_FILE: @@ -949,6 +951,10 @@ if __name__ == '__main__': CONFIG = build_config(cli_args.CFG_FILE) # Call the external routing to start the system logger + if cli_args.LOG_LEVEL: + CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL + if cli_args.LOG_HANDLERS: + CONFIG['LOGGER']['LOG_HANDLERS'] = cli_args.LOG_HANDLERS logger = config_logging(CONFIG['LOGGER']) config_reports(CONFIG) diff --git a/play_group.py b/play_group.py index 26a3d85..22cd335 100755 --- a/play_group.py +++ b/play_group.py @@ -147,15 +147,21 @@ if __name__ == '__main__': # CLI argument parser - handles picking up the config file from the command line, and sending a "help" message parser = argparse.ArgumentParser() parser.add_argument('-c', '--config', action='store', dest='CFG_FILE', help='/full/path/to/config.file (usually dmrlink.cfg)') + parser.add_argument('-ll', '--log_level', action='store', dest='LOG_LEVEL', help='Override config file logging level.') + parser.add_argument('-lh', '--log_handle', action='store', dest='LOG_HANDLERS', help='Override config file logging handler.') cli_args = parser.parse_args() if not cli_args.CFG_FILE: cli_args.CFG_FILE = os.path.dirname(os.path.abspath(__file__))+'/dmrlink.cfg' - + # Call the external routine to build the configuration dictionary CONFIG = dmrlink_config.build_config(cli_args.CFG_FILE) - + # Call the external routing to start the system logger + if cli_args.LOG_LEVEL: + CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL + if cli_args.LOG_HANDLERS: + CONFIG['LOGGER']['LOG_HANDLERS'] = cli_args.LOG_HANDLERS logger = dmrlink_log.config_logging(CONFIG['LOGGER']) logger.info('DMRlink \'record.py\' (c) 2014 N0MJS & the K0USY Group - SYSTEM STARTING...') @@ -182,4 +188,4 @@ if __name__ == '__main__': systems[system] = playIPSC(system, CONFIG, logger) reactor.listenUDP(CONFIG['SYSTEMS'][system]['LOCAL']['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['LOCAL']['IP']) - reactor.run() \ No newline at end of file + reactor.run() diff --git a/playback.py b/playback.py index c7794cc..41b2a1b 100755 --- a/playback.py +++ b/playback.py @@ -128,15 +128,21 @@ if __name__ == '__main__': # CLI argument parser - handles picking up the config file from the command line, and sending a "help" message parser = argparse.ArgumentParser() parser.add_argument('-c', '--config', action='store', dest='CFG_FILE', help='/full/path/to/config.file (usually dmrlink.cfg)') + parser.add_argument('-ll', '--log_level', action='store', dest='LOG_LEVEL', help='Override config file logging level.') + parser.add_argument('-lh', '--log_handle', action='store', dest='LOG_HANDLERS', help='Override config file logging handler.') cli_args = parser.parse_args() if not cli_args.CFG_FILE: cli_args.CFG_FILE = os.path.dirname(os.path.abspath(__file__))+'/dmrlink.cfg' - + # Call the external routine to build the configuration dictionary CONFIG = dmrlink_config.build_config(cli_args.CFG_FILE) - + # Call the external routing to start the system logger + if cli_args.LOG_LEVEL: + CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL + if cli_args.LOG_HANDLERS: + CONFIG['LOGGER']['LOG_HANDLERS'] = cli_args.LOG_HANDLERS logger = dmrlink_log.config_logging(CONFIG['LOGGER']) logger.info('DMRlink \'playback.py\' (c) 2013, 2014 N0MJS & the K0USY Group - SYSTEM STARTING...') diff --git a/rcm.py b/rcm.py index 993c8f4..866a0f0 100755 --- a/rcm.py +++ b/rcm.py @@ -163,15 +163,21 @@ if __name__ == '__main__': # CLI argument parser - handles picking up the config file from the command line, and sending a "help" message parser = argparse.ArgumentParser() parser.add_argument('-c', '--config', action='store', dest='CFG_FILE', help='/full/path/to/config.file (usually dmrlink.cfg)') + parser.add_argument('-ll', '--log_level', action='store', dest='LOG_LEVEL', help='Override config file logging level.') + parser.add_argument('-lh', '--log_handle', action='store', dest='LOG_HANDLERS', help='Override config file logging handler.') cli_args = parser.parse_args() if not cli_args.CFG_FILE: cli_args.CFG_FILE = os.path.dirname(os.path.abspath(__file__))+'/dmrlink.cfg' - + # Call the external routine to build the configuration dictionary CONFIG = dmrlink_config.build_config(cli_args.CFG_FILE) - + # Call the external routing to start the system logger + if cli_args.LOG_LEVEL: + CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL + if cli_args.LOG_HANDLERS: + CONFIG['LOGGER']['LOG_HANDLERS'] = cli_args.LOG_HANDLERS logger = dmrlink_log.config_logging(CONFIG['LOGGER']) logger.info('DMRlink \'rcm.py\' (c) 2013, 2014 N0MJS & the K0USY Group - SYSTEM STARTING...') @@ -221,4 +227,4 @@ if __name__ == '__main__': systems[system] = rcmIPSC(system, CONFIG, logger) reactor.listenUDP(CONFIG['SYSTEMS'][system]['LOCAL']['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['LOCAL']['IP']) - reactor.run() \ No newline at end of file + reactor.run() diff --git a/record.py b/record.py index 730930d..bc5b5aa 100755 --- a/record.py +++ b/record.py @@ -119,13 +119,24 @@ if __name__ == '__main__': # CLI argument parser - handles picking up the config file from the command line, and sending a "help" message parser = argparse.ArgumentParser() parser.add_argument('-c', '--config', action='store', dest='CFG_FILE', help='/full/path/to/config.file (usually dmrlink.cfg)') + parser.add_argument('-ll', '--log_level', action='store', dest='LOG_LEVEL', help='Override config file logging level.') + parser.add_argument('-lh', '--log_handle', action='store', dest='LOG_HANDLERS', help='Override config file logging handler.') cli_args = parser.parse_args() if not cli_args.CFG_FILE: cli_args.CFG_FILE = os.path.dirname(os.path.abspath(__file__))+'/dmrlink.cfg' - + # Call the external routine to build the configuration dictionary CONFIG = dmrlink_config.build_config(cli_args.CFG_FILE) + + # Call the external routing to start the system logger + if cli_args.LOG_LEVEL: + CONFIG['LOGGER']['LOG_LEVEL'] = cli_args.LOG_LEVEL + if cli_args.LOG_HANDLERS: + CONFIG['LOGGER']['LOG_HANDLERS'] = cli_args.LOG_HANDLERS + logger = dmrlink_log.config_logging(CONFIG['LOGGER']) + + CONFIG = dmrlink_config.build_config(cli_args.CFG_FILE) # Call the external routing to start the system logger logger = dmrlink_log.config_logging(CONFIG['LOGGER'])