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

Cleanup external IP lookup to only happen once

Browse source
This commit is contained in:
samwiseg0 2019-01-07 23:12:34 -08:00
parent 8580ce02a9
commit 50c65ef5ac
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
varken/tautulli.py
View file

@ -17,6 +17,8 @@ class TautulliAPI(object):
self.session.params = {'apikey': self.server.api_key} self.session.params = {'apikey': self.server.api_key}
self.endpoint = '/api/v2' self.endpoint = '/api/v2'
self.logger = getLogger() self.logger = getLogger()
self.my_ip = None
def __repr__(self): def __repr__(self):
return f"<tautulli-{self.server.id}>" return f"<tautulli-{self.server.id}>"
@ -56,17 +58,22 @@ class TautulliAPI(object):
try: try:
geodata = self.geoiphandler.lookup(session.ip_address_public) geodata = self.geoiphandler.lookup(session.ip_address_public)
except (ValueError, AddressNotFoundError): except (ValueError, AddressNotFoundError):
if self.server.fallback_ip: self.logger.debug('Public IP missing for Tautulli session...')
if not self.my_ip:
# Try the fallback ip in the config file # Try the fallback ip in the config file
try: try:
self.logger.debug('Atempting to use the failback IP...')
geodata = self.geoiphandler.lookup(self.server.fallback_ip) geodata = self.geoiphandler.lookup(self.server.fallback_ip)
except AddressNotFoundError as e: except AddressNotFoundError as e:
self.logger.error('%s', e) self.logger.error('%s', e)
_exit(1)
self.my_ip = self.session.get('http://ip.42.pl/raw').text
self.logger.debug('Looked the public IP and set it to %s', self.my_ip)
geodata = self.geoiphandler.lookup(self.my_ip)
else: else:
my_ip = self.session.get('http://ip.42.pl/raw').text geodata = self.geoiphandler.lookup(self.my_ip)
geodata = self.geoiphandler.lookup(my_ip)
if not all([geodata.location.latitude, geodata.location.longitude]): if not all([geodata.location.latitude, geodata.location.longitude]):
latitude = 37.234332396 latitude = 37.234332396