From e6e4965be6e2914d6006e1300da72a20893c7e88 Mon Sep 17 00:00:00 2001 From: "Nicholas St. Germain" Date: Sat, 12 Jan 2019 00:41:39 -0600 Subject: [PATCH] 1.6.2 patch for #91 --- varken/__init__.py | 2 +- varken/iniparser.py | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/varken/__init__.py b/varken/__init__.py index b9c815f..2192d2d 100644 --- a/varken/__init__.py +++ b/varken/__init__.py @@ -1,2 +1,2 @@ -VERSION = "1.6.1" +VERSION = "1.6.2" BRANCH = 'master' diff --git a/varken/iniparser.py b/varken/iniparser.py index 3e7d2ec..fd8157b 100644 --- a/varken/iniparser.py +++ b/varken/iniparser.py @@ -140,13 +140,18 @@ class INIParser(object): self.config = self.read_file('varken.ini') self.config_blacklist() # Parse InfluxDB options - url = self.url_check(self.config.get('influxdb', 'url'), include_port=False, section='influxdb') - port = self.config.getint('influxdb', 'port') - ssl = self.config.getboolean('influxdb', 'ssl') - verify_ssl = self.config.getboolean('influxdb', 'verify_ssl') + try: + url = self.url_check(self.config.get('influxdb', 'url'), include_port=False, section='influxdb') + port = self.config.getint('influxdb', 'port') + ssl = self.config.getboolean('influxdb', 'ssl') + verify_ssl = self.config.getboolean('influxdb', 'verify_ssl') - username = self.config.get('influxdb', 'username') - password = self.config.get('influxdb', 'password') + username = self.config.get('influxdb', 'username') + password = self.config.get('influxdb', 'password') + except NoOptionError as e: + self.logger.error('Missing key in %s. Error: %s', "influxdb", e) + self.rectify_ini() + return self.influx_server = InfluxServer(url=url, port=port, username=username, password=password, ssl=ssl, verify_ssl=verify_ssl)