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

make an attempt to reauth unifi + let users know they didnt RTFM

Browse source
This commit is contained in:
Nicholas St. Germain 2019-04-22 14:05:17 -05:00
parent c42a0b58e4
commit 2a260f6ee9
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
varken/dbmanager.py
View file

@ -8,6 +8,9 @@ from influxdb.exceptions import InfluxDBServerError
class DBManager(object): class DBManager(object):
def __init__(self, server): def __init__(self, server):
self.server = server self.server = server
if self.server.url == "influxdb.domain.tld":
self.logger.critical("You have not configured your varken.ini. Please read Wiki page for configuration")
exit()
self.influx = InfluxDBClient(host=self.server.url, port=self.server.port, username=self.server.username, self.influx = InfluxDBClient(host=self.server.url, port=self.server.port, username=self.server.username,
password=self.server.password, ssl=self.server.ssl, database='varken', password=self.server.password, ssl=self.server.ssl, database='varken',
verify_ssl=self.server.verify_ssl) verify_ssl=self.server.verify_ssl)

13
varken/unifi.py
View file

@ -12,7 +12,7 @@ class UniFiAPI(object):
# Create session to reduce server web thread load, and globally define pageSize for all requests # Create session to reduce server web thread load, and globally define pageSize for all requests
self.session = Session() self.session = Session()
self.logger = getLogger() self.logger = getLogger()
self.get_retry = True
self.get_cookie() self.get_cookie()
def __repr__(self): def __repr__(self):
@ -37,6 +37,13 @@ class UniFiAPI(object):
get = connection_handler(self.session, req, self.server.verify_ssl) get = connection_handler(self.session, req, self.server.verify_ssl)
if not get: if not get:
if self.get_retry:
self.get_retry = False
self.logger.error("Attempting to reauthenticate for unifi-%s", self.server.id)
self.get_cookie()
self.get_usg_stats()
else:
self.get_retry = True
self.logger.error("Disregarding Job get_usg_stats for unifi-%s", self.server.id) self.logger.error("Disregarding Job get_usg_stats for unifi-%s", self.server.id)
return return
@ -63,10 +70,6 @@ class UniFiAPI(object):
"rx_bytes_current": device['wan1']['rx_bytes-r'], "rx_bytes_current": device['wan1']['rx_bytes-r'],
"tx_bytes_total": device['wan1']['tx_bytes'], "tx_bytes_total": device['wan1']['tx_bytes'],
"tx_bytes_current": device['wan1']['tx_bytes-r'], "tx_bytes_current": device['wan1']['tx_bytes-r'],
# Commenting speedtest out until Unifi gets their shit together
# "speedtest_latency": device['speedtest-status']['latency'],
# "speedtest_download": device['speedtest-status']['xput_download'],
# "speedtest_upload": device['speedtest-status']['xput_upload'],
"cpu_loadavg_1": float(device['sys_stats']['loadavg_1']), "cpu_loadavg_1": float(device['sys_stats']['loadavg_1']),
"cpu_loadavg_5": float(device['sys_stats']['loadavg_5']), "cpu_loadavg_5": float(device['sys_stats']['loadavg_5']),
"cpu_loadavg_15": float(device['sys_stats']['loadavg_15']), "cpu_loadavg_15": float(device['sys_stats']['loadavg_15']),