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

v1.6.2 Merge

Browse source 
v1.6.2 Merge
This commit is contained in:
Nicholas St. Germain 2019-01-12 00:44:15 -06:00 • committed by GitHub
commit 7fc5646c0e
3 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
CHANGELOG.md
View file

@ -1,6 +1,17 @@
# Change Log # Change Log
## [v1.6.1](https://github.com/Boerderij/Varken/tree/v1.6.1) (2019-01-11) ## [v1.6.2](https://github.com/Boerderij/Varken/tree/v1.6.2) (2019-01-12)
[Full Changelog](https://github.com/Boerderij/Varken/compare/v1.6.1...v1.6.2)
**Fixed bugs:**
- Rectify influxdb ini [\#91](https://github.com/Boerderij/Varken/issues/91)
**Merged pull requests:**
- v1.6.2 Merge [\#90](https://github.com/Boerderij/Varken/pull/92) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
## [v1.6.1](https://github.com/Boerderij/Varken/tree/v1.6.1) (2019-01-12)
[Full Changelog](https://github.com/Boerderij/Varken/compare/v1.6...v1.6.1) [Full Changelog](https://github.com/Boerderij/Varken/compare/v1.6...v1.6.1)
**Implemented enhancements:** **Implemented enhancements:**
@ -17,7 +28,7 @@
**Merged pull requests:** **Merged pull requests:**
- v1.6 Merge [\#90](https://github.com/Boerderij/Varken/pull/85) ([DirtyCajunRice](https://github.com/DirtyCajunRice)) - v1.6.1 Merge [\#90](https://github.com/Boerderij/Varken/pull/90) ([DirtyCajunRice](https://github.com/DirtyCajunRice))
## [v1.6](https://github.com/Boerderij/Varken/tree/v1.6) (2019-01-04) ## [v1.6](https://github.com/Boerderij/Varken/tree/v1.6) (2019-01-04)
[Full Changelog](https://github.com/Boerderij/Varken/compare/v1.5...v1.6) [Full Changelog](https://github.com/Boerderij/Varken/compare/v1.5...v1.6)

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)