github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-19 21:03:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add remote access failure reason

Browse source
This commit is contained in:
JonnyWong16 2020-04-24 18:03:05 -07:00
commit 54a7839421
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plexpy/activity_pinger.py
View file

@ -312,31 +312,27 @@ def check_server_access():
# Check for remote access # Check for remote access
if server_response: if server_response:
if server_response['reason']:
mapping_state = server_response['mapping_state']
mapping_error = server_response['mapping_error']
# Check if the port is mapped
if not mapping_state == 'mapped':
ext_ping_count += 1 ext_ping_count += 1
logger.warn(u"Tautulli Monitor :: Plex remote access port not mapped, ping attempt %s." \ logger.warn(u"Tautulli Monitor :: Remote access failed: %s, ping attempt %s." \
% str(ext_ping_count)) % (server_response['reason'], str(ext_ping_count)))
# Check if the port is open
elif mapping_error == 'unreachable': # Waiting for port mapping
ext_ping_count += 1 elif server_response['mapping_state'] == 'waiting':
logger.warn(u"Tautulli Monitor :: Plex remote access port mapped, but mapping failed, ping attempt %s." \ logger.warn(u"Tautulli Monitor :: Remote access waiting for port mapping, ping attempt %s." \
% str(ext_ping_count)) % str(ext_ping_count))
# Reset external ping counter # Reset external ping counter
else: else:
if ext_ping_count >= plexpy.CONFIG.REMOTE_ACCESS_PING_THRESHOLD: if ext_ping_count >= plexpy.CONFIG.REMOTE_ACCESS_PING_THRESHOLD:
logger.info(u"Tautulli Monitor :: Plex remote access is back up.") logger.info(u"Tautulli Monitor :: Plex remote access is back up.")
plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_extup'}) plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_extup', 'remote_access_info': server_response})
ext_ping_count = 0 ext_ping_count = 0
if ext_ping_count == plexpy.CONFIG.REMOTE_ACCESS_PING_THRESHOLD: if ext_ping_count == plexpy.CONFIG.REMOTE_ACCESS_PING_THRESHOLD:
plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_extdown'}) plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_extdown', 'remote_access_info': server_response})
def check_server_updates(): def check_server_updates():

18
plexpy/pmsconnect.py
View file

@ -2963,10 +2963,26 @@ class PmsConnect(object):
for a in xml_head: for a in xml_head:
server_response = {'mapping_state': helpers.get_xml_attr(a, 'mappingState'), server_response = {'mapping_state': helpers.get_xml_attr(a, 'mappingState'),
'mapping_error': helpers.get_xml_attr(a, 'mappingError'), 'mapping_error': helpers.get_xml_attr(a, 'mappingError'),
'sign_in_state': helpers.get_xml_attr(a, 'signInState'),
'public_address': helpers.get_xml_attr(a, 'publicAddress'), 'public_address': helpers.get_xml_attr(a, 'publicAddress'),
'public_port': helpers.get_xml_attr(a, 'publicPort') 'public_port': helpers.get_xml_attr(a, 'publicPort'),
'private_address': helpers.get_xml_attr(a, 'privateAddress'),
'private_port': helpers.get_xml_attr(a, 'privatePort')
} }
if server_response['mapping_state'] == 'unknown':
server_response['reason'] = 'Plex remote access port mapping unknown'
elif server_response['mapping_state'] not in ('mapped', 'waiting'):
server_response['reason'] = 'Plex remote access port not mapped'
elif server_response['mapping_error'] == 'unreachable':
server_response['reason'] = 'Plex remote access port mapped, ' \
'but the port is unreachable from Plex.tv'
elif server_response['mapping_error'] == 'publisherror':
server_response['reason'] = 'Plex remote access port mapped, ' \
'but failed to publish the port to Plex.tv'
else:
server_response['reason'] = ''
return server_response return server_response
def get_update_staus(self): def get_update_staus(self):