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

Better error checking for failback_ip

Browse source
This commit is contained in:
samwiseg0 2019-01-01 23:41:23 -05:00
parent 210e2d19c1
commit bf20f84224
3 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
varken/tautulli.py
View file

@ -1,3 +1,4 @@
from os import _exit
from logging import getLogger
from requests import Session, Request
from datetime import datetime, timezone
@ -45,13 +46,19 @@ class TautulliAPI(object):
getattr(session, 'ip_address_public')
except AttributeError:
self.logger.error('Public IP attribute missing!!! Do you have an old version of Tautulli (v1)?')
exit(1)
_exit(1)
try:
geodata = self.geoiphandler.lookup(session.ip_address_public)
except (ValueError, AddressNotFoundError):
if self.server.fallback_ip:
geodata = self.geoiphandler.lookup(self.server.fallback_ip)
# Try the failback ip in the config file
try:
geodata = self.geoiphandler.lookup(self.server.fallback_ip)
except AddressNotFoundError as e:
self.logger.error('%s', e)
_exit(1)
else:
my_ip = self.session.get('http://ip.42.pl/raw').text
geodata = self.geoiphandler.lookup(my_ip)