d_mcknight/Varken
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1.6.2 patch for #91

Browse source
This commit is contained in:
Nicholas St. Germain 2019-01-12 00:41:39 -06:00
parent 197ccc5d09
commit e6e4965be6
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
varken/__init__.py
View file

@ -1,2 +1,2 @@
VERSION = "1.6.1" VERSION = "1.6.2"
BRANCH = 'master' BRANCH = 'master'

17
varken/iniparser.py
View file

@ -140,13 +140,18 @@ class INIParser(object):
self.config = self.read_file('varken.ini') self.config = self.read_file('varken.ini')
self.config_blacklist() self.config_blacklist()
# Parse InfluxDB options # Parse InfluxDB options
url = self.url_check(self.config.get('influxdb', 'url'), include_port=False, section='influxdb') try:
port = self.config.getint('influxdb', 'port') url = self.url_check(self.config.get('influxdb', 'url'), include_port=False, section='influxdb')
ssl = self.config.getboolean('influxdb', 'ssl') port = self.config.getint('influxdb', 'port')
verify_ssl = self.config.getboolean('influxdb', 'verify_ssl') ssl = self.config.getboolean('influxdb', 'ssl')
verify_ssl = self.config.getboolean('influxdb', 'verify_ssl')
username = self.config.get('influxdb', 'username') username = self.config.get('influxdb', 'username')
password = self.config.get('influxdb', 'password') 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, self.influx_server = InfluxServer(url=url, port=port, username=username, password=password, ssl=ssl,
verify_ssl=verify_ssl) verify_ssl=verify_ssl)