v1.6.2 Merge

v1.6.2 Merge

CHANGELOG.md

@@ -1,6 +1,17 @@
 # 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)
 
 **Implemented enhancements:**
@@ -17,7 +28,7 @@
 
 **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)
 [Full Changelog](https://github.com/Boerderij/Varken/compare/v1.5...v1.6)

varken/__init__.py

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

varken/iniparser.py

@@ -140,13 +140,18 @@ def parse_opts(self, read_file=False):
             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')
-
-        username = self.config.get('influxdb', 'username')
-        password = self.config.get('influxdb', 'password')
+        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')
+        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)