From 617e695b2012fb94303d555376b151fc83b64ff4 Mon Sep 17 00:00:00 2001 From: Clint Armstrong Date: Sat, 18 Jul 2015 21:38:27 -0400 Subject: [PATCH] better logging error checking --- poller-service.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/poller-service.py b/poller-service.py index 4fcf37818..0989b27a2 100755 --- a/poller-service.py +++ b/poller-service.py @@ -60,15 +60,17 @@ except: sys.exit(2) try: - loglevel = config['poller_service_loglevel'] + loglevel = int(config['poller_service_loglevel']) except KeyError: loglevel = 20 -if not isinstance(loglevel, int): - loglevel = logging.getLevelName(loglevel) -if not isinstance(loglevel, int): +except ValueError: + loglevel = logging.getLevelName(config['poller_service_loglevel']) + +try: + log.setLevel(loglevel) +except ValueError: log.warning('ERROR: {0} is not a valid log level. If using python 3.4.0-3.4.1 you must specify loglevel by number'.format(str(loglevel))) - loglevel = 20 -log.setLevel(loglevel) + log.setLevel(20) poller_path = config['install_dir'] + '/poller.php' discover_path = config['install_dir'] + '/discovery.php'