From 29522428dec43adf97b349b61c3d387c91059840 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 28 May 2016 14:01:29 -0700 Subject: [PATCH] Catch exception when retrieving current activity --- plexpy/webserve.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 06a9126f..20ab5477 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -3738,19 +3738,22 @@ class WebInterface(object): } ``` """ - pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN) - result = pms_connect.get_current_activity() + try: + pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN) + result = pms_connect.get_current_activity() - if result: - data_factory = datafactory.DataFactory() - for session in result['sessions']: - if not session['ip_address']: - ip_address = data_factory.get_session_ip(session['session_key']) - session['ip_address'] = ip_address + if result: + data_factory = datafactory.DataFactory() + for session in result['sessions']: + if not session['ip_address']: + ip_address = data_factory.get_session_ip(session['session_key']) + session['ip_address'] = ip_address - return result - else: - logger.warn(u"Unable to retrieve data for get_activity.") + return result + else: + logger.warn(u"Unable to retrieve data for get_activity.") + except Exception as e: + logger.exception(u"Unable to retrieve data for get_activity: %s" % e) @cherrypy.expose @cherrypy.tools.json_out()