mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-07-10 15:32:38 -07:00
Only show IPv4 addresses
This commit is contained in:
parent
b8d9c8cc47
commit
10c54c2d10
2 changed files with 23 additions and 23 deletions
|
@ -286,12 +286,12 @@ class ActivityProcessor(object):
|
||||||
# The logged IP will always be the first match and we don't want localhost entries
|
# The logged IP will always be the first match and we don't want localhost entries
|
||||||
if ipv4[0] != '127.0.0.1':
|
if ipv4[0] != '127.0.0.1':
|
||||||
# check if IPv4 mapped IPv6 address (::ffff:xxx.xxx.xxx.xxx)
|
# check if IPv4 mapped IPv6 address (::ffff:xxx.xxx.xxx.xxx)
|
||||||
if '::ffff:' + ipv4[0] in line:
|
#if '::ffff:' + ipv4[0] in line:
|
||||||
logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s "
|
# logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s "
|
||||||
u"and machineIdentifier %s."
|
# u"and machineIdentifier %s."
|
||||||
% ('::ffff:' + ipv4[0], rating_key, machine_id))
|
# % ('::ffff:' + ipv4[0], rating_key, machine_id))
|
||||||
return '::ffff:' + ipv4[0]
|
# return '::ffff:' + ipv4[0]
|
||||||
else:
|
#else:
|
||||||
logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s "
|
logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s "
|
||||||
u"and machineIdentifier %s."
|
u"and machineIdentifier %s."
|
||||||
% (ipv4[0], rating_key, machine_id))
|
% (ipv4[0], rating_key, machine_id))
|
||||||
|
@ -315,11 +315,11 @@ class ActivityProcessor(object):
|
||||||
if ipv4:
|
if ipv4:
|
||||||
# The logged IP will always be the first match and we don't want localhost entries
|
# The logged IP will always be the first match and we don't want localhost entries
|
||||||
if ipv4[0] != '127.0.0.1':
|
if ipv4[0] != '127.0.0.1':
|
||||||
if '::ffff:' + ipv4[0] in line:
|
#if '::ffff:' + ipv4[0] in line:
|
||||||
logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." %
|
# logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." %
|
||||||
('::ffff:' + ipv4[0], rating_key))
|
# ('::ffff:' + ipv4[0], rating_key))
|
||||||
return '::ffff:' + ipv4[0]
|
# return '::ffff:' + ipv4[0]
|
||||||
else:
|
#else:
|
||||||
logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." %
|
logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." %
|
||||||
(ipv4[0], rating_key))
|
(ipv4[0], rating_key))
|
||||||
return ipv4[0]
|
return ipv4[0]
|
||||||
|
|
|
@ -803,7 +803,7 @@ class PmsConnect(object):
|
||||||
'user_id': user_details['user_id'],
|
'user_id': user_details['user_id'],
|
||||||
'friendly_name': user_details['friendly_name'],
|
'friendly_name': user_details['friendly_name'],
|
||||||
'user_thumb': user_details['thumb'],
|
'user_thumb': user_details['thumb'],
|
||||||
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address'),
|
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-1],
|
||||||
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
|
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
|
||||||
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
|
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
|
||||||
'machine_id': machine_id,
|
'machine_id': machine_id,
|
||||||
|
@ -924,7 +924,7 @@ class PmsConnect(object):
|
||||||
'user_id': user_details['user_id'],
|
'user_id': user_details['user_id'],
|
||||||
'friendly_name': user_details['friendly_name'],
|
'friendly_name': user_details['friendly_name'],
|
||||||
'user_thumb': user_details['thumb'],
|
'user_thumb': user_details['thumb'],
|
||||||
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address'),
|
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-1],
|
||||||
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
|
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
|
||||||
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
|
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
|
||||||
'machine_id': machine_id,
|
'machine_id': machine_id,
|
||||||
|
@ -981,7 +981,7 @@ class PmsConnect(object):
|
||||||
'user_id': user_details['user_id'],
|
'user_id': user_details['user_id'],
|
||||||
'friendly_name': user_details['friendly_name'],
|
'friendly_name': user_details['friendly_name'],
|
||||||
'user_thumb': user_details['thumb'],
|
'user_thumb': user_details['thumb'],
|
||||||
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address'),
|
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-1],
|
||||||
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
|
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
|
||||||
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
|
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
|
||||||
'machine_id': machine_id,
|
'machine_id': machine_id,
|
||||||
|
@ -1038,7 +1038,7 @@ class PmsConnect(object):
|
||||||
'user_id': user_details['user_id'],
|
'user_id': user_details['user_id'],
|
||||||
'friendly_name': user_details['friendly_name'],
|
'friendly_name': user_details['friendly_name'],
|
||||||
'user_thumb': user_details['thumb'],
|
'user_thumb': user_details['thumb'],
|
||||||
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address'),
|
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-1],
|
||||||
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
|
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
|
||||||
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
|
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
|
||||||
'machine_id': machine_id,
|
'machine_id': machine_id,
|
||||||
|
@ -1128,7 +1128,7 @@ class PmsConnect(object):
|
||||||
'user_id': user_details['user_id'],
|
'user_id': user_details['user_id'],
|
||||||
'friendly_name': user_details['friendly_name'],
|
'friendly_name': user_details['friendly_name'],
|
||||||
'user_thumb': user_details['thumb'],
|
'user_thumb': user_details['thumb'],
|
||||||
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address'),
|
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-1],
|
||||||
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
|
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
|
||||||
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
|
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
|
||||||
'machine_id': machine_id,
|
'machine_id': machine_id,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue