diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py index bdc2b83d..fb1a2376 100644 --- a/plexpy/activity_processor.py +++ b/plexpy/activity_processor.py @@ -286,16 +286,16 @@ class ActivityProcessor(object): # The logged IP will always be the first match and we don't want localhost entries if ipv4[0] != '127.0.0.1': # check if IPv4 mapped IPv6 address (::ffff:xxx.xxx.xxx.xxx) - if '::ffff:' + ipv4[0] in line: - logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s " - u"and machineIdentifier %s." - % ('::ffff:' + ipv4[0], rating_key, machine_id)) - return '::ffff:' + ipv4[0] - else: - logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s " - u"and machineIdentifier %s." - % (ipv4[0], rating_key, machine_id)) - return ipv4[0] + #if '::ffff:' + ipv4[0] in line: + # logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s " + # u"and machineIdentifier %s." + # % ('::ffff:' + ipv4[0], rating_key, machine_id)) + # return '::ffff:' + ipv4[0] + #else: + logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s " + u"and machineIdentifier %s." + % (ipv4[0], rating_key, machine_id)) + return ipv4[0] logger.debug(u"PlexPy ActivityProcessor :: Unable to find IP address on first pass. " u"Attempting fallback check in 5 seconds...") @@ -315,14 +315,14 @@ class ActivityProcessor(object): if ipv4: # The logged IP will always be the first match and we don't want localhost entries if ipv4[0] != '127.0.0.1': - if '::ffff:' + ipv4[0] in line: - logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." % - ('::ffff:' + ipv4[0], rating_key)) - return '::ffff:' + ipv4[0] - else: - logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." % - (ipv4[0], rating_key)) - return ipv4[0] + #if '::ffff:' + ipv4[0] in line: + # logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." % + # ('::ffff:' + ipv4[0], rating_key)) + # return '::ffff:' + ipv4[0] + #else: + logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." % + (ipv4[0], rating_key)) + return ipv4[0] logger.debug(u"PlexPy ActivityProcessor :: Unable to find IP address on fallback search. Not logging IP address.") diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index a313813a..d52ff65a 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -803,7 +803,7 @@ class PmsConnect(object): 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], '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'), 'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'), 'machine_id': machine_id, @@ -924,7 +924,7 @@ class PmsConnect(object): 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], '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'), 'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'), 'machine_id': machine_id, @@ -981,7 +981,7 @@ class PmsConnect(object): 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], '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'), 'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'), 'machine_id': machine_id, @@ -1038,7 +1038,7 @@ class PmsConnect(object): 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], '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'), 'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'), 'machine_id': machine_id, @@ -1128,7 +1128,7 @@ class PmsConnect(object): 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], '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'), 'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'), 'machine_id': machine_id,