diff --git a/opensprinkler_exporter.py b/opensprinkler_exporter.py index 2c39951618d717ccbab85eed62ce66cd0d12f946..1565102d16bc2b1342ed4528730ea7b419f6d015 100755 --- a/opensprinkler_exporter.py +++ b/opensprinkler_exporter.py @@ -44,21 +44,17 @@ wt_p = Gauge('opensprinkler_wt_p', 'Weather provider: ?') def main(): """Start main function.""" # Setup logging - try: - loglevel = getattr(logging, os.environ.get('LOGLEVEL', 'INFO').upper()) - except AttributeError: - pass - + loglevel = getattr(logging, os.environ.get('LOGLEVEL', 'INFO').upper()) log.setLevel(level=loglevel) interval = int(os.environ.get('INTERVAL', 60)) - PW = str(os.environ['OS_API_PW']) - API_URL = str(os.environ['OS_API_URL'], 'http://localhost:8080') - url = f'{API_URL}/jc?pw={PW}' + password = str(os.environ['OS_API_PW']) + api_url = str(os.environ.get('OS_API_URL', 'http://localhost:8080')) + url = f'{api_url}/jc?pw={password}' port = int(os.environ.get('PORT', 3089)) log.info('Starting prometheus exporter on port %s', str(port)) - log.info(url) + log.debug(f'Using URL: {url}') start_http_server(port) while True: @@ -66,9 +62,8 @@ def main(): req = requests.get(url) if req.status_code == 200: - log.info("Success") j = json.loads(req.content) - log.debug(j) + log.debug(f'Got a successful response: {j}') wto = j['wto'] wtdata = j['wtdata'] @@ -91,7 +86,7 @@ def main(): except Exception as err: log.info(err) - log.info('sleeping for %d seconds', interval) + log.debug('sleeping for %d seconds', interval) time.sleep(interval)