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

Clean up linting errors

Browse source
This commit is contained in:
Gabe Revells 2021-02-13 16:38:42 -05:00 committed by Daniel
parent cf1133e637
commit a4d54f912c
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
varken/influxdb2manager.py
View file

@ -1,8 +1,7 @@
from sys import exit from sys import exit
from logging import getLogger from logging import getLogger
from requests.exceptions import ConnectionError
import influxdb_client import influxdb_client
from influxdb_client import InfluxDBClient, Point from influxdb_client import InfluxDBClient
from influxdb_client.client.write_api import SYNCHRONOUS from influxdb_client.client.write_api import SYNCHRONOUS
@ -15,7 +14,8 @@ class InfluxDB2Manager(object):
exit() exit()
self.influx = InfluxDBClient(url=self.server.url, token=self.server.token, org=self.server.org, self.influx = InfluxDBClient(url=self.server.url, token=self.server.token, org=self.server.org,
timeout=self.server.timeout, verify_ssl=self.server.verify_ssl, ssl_ca_cert=self.server.ssl) timeout=self.server.timeout, verify_ssl=self.server.verify_ssl,
ssl_ca_cert=self.server.ssl)
self.influx_write_api = self.influx.write_api(write_options=SYNCHRONOUS) self.influx_write_api = self.influx.write_api(write_options=SYNCHRONOUS)
# Create the bucket if needed # Create the bucket if needed
@ -41,6 +41,6 @@ class InfluxDB2Manager(object):
try: try:
self.influx_write_api.write(bucket=self.server.bucket, record=d) self.influx_write_api.write(bucket=self.server.bucket, record=d)
except (InfluxDBServerError, ConnectionError) as e: except Exception as e:
self.logger.error('Error writing data to influxdb2. Dropping this set of data. ' self.logger.error('Error writing data to influxdb2. Dropping this set of data. '
'Check your database! Error: %s', e) 'Check your database! Error: %s', e)

12
varken/iniparser.py
View file

@ -146,12 +146,14 @@ class INIParser(object):
self.config_blacklist() self.config_blacklist()
# Parse InfluxDB options # Parse InfluxDB options
self.influx2_enabled = env.get('VRKN_GLOBAL_INFLUXDB2_ENABLED', self.config.getboolean('global', 'influx2_enabled')) self.influx2_enabled = env.get('VRKN_GLOBAL_INFLUXDB2_ENABLED',
self.config.getboolean('global', 'influx2_enabled'))
if self.influx2_enabled: if self.influx2_enabled:
# Use INFLUX version 2 # Use INFLUX version 2
try: try:
url = self.url_check(env.get('VRKN_INFLUXDB2_URL', self.config.get('influx2', 'url')), section='influx2') url = self.url_check(env.get('VRKN_INFLUXDB2_URL', self.config.get('influx2', 'url')),
section='influx2')
ssl = boolcheck(env.get('VRKN_INFLUXDB2_SSL', self.config.get('influx2', 'ssl'))) ssl = boolcheck(env.get('VRKN_INFLUXDB2_SSL', self.config.get('influx2', 'ssl')))
verify_ssl = boolcheck(env.get('VRKN_INFLUXDB2_VERIFY_SSL', self.config.get('influx2', 'verify_ssl'))) verify_ssl = boolcheck(env.get('VRKN_INFLUXDB2_VERIFY_SSL', self.config.get('influx2', 'verify_ssl')))
@ -164,11 +166,11 @@ class INIParser(object):
return return
self.influx_server = Influx2Server(url=url, token=token, org=org, timeout=timeout, ssl=ssl, self.influx_server = Influx2Server(url=url, token=token, org=org, timeout=timeout, ssl=ssl,
verify_ssl=verify_ssl) verify_ssl=verify_ssl)
else: else:
try: try:
url = self.url_check(env.get('VRKN_INFLUXDB_URL', self.config.get('influxdb', 'url')), url = self.url_check(env.get('VRKN_INFLUXDB_URL', self.config.get('influxdb', 'url')),
include_port=False, section='influxdb') include_port=False, section='influxdb')
port = int(env.get('VRKN_INFLUXDB_PORT', self.config.getint('influxdb', 'port'))) port = int(env.get('VRKN_INFLUXDB_PORT', self.config.getint('influxdb', 'port')))
ssl = boolcheck(env.get('VRKN_INFLUXDB_SSL', self.config.get('influxdb', 'ssl'))) ssl = boolcheck(env.get('VRKN_INFLUXDB_SSL', self.config.get('influxdb', 'ssl')))
verify_ssl = boolcheck(env.get('VRKN_INFLUXDB_VERIFY_SSL', self.config.get('influxdb', 'verify_ssl'))) verify_ssl = boolcheck(env.get('VRKN_INFLUXDB_VERIFY_SSL', self.config.get('influxdb', 'verify_ssl')))
@ -181,7 +183,7 @@ class INIParser(object):
return 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)
# Check for all enabled services # Check for all enabled services
for service in self.services: for service in self.services: