From 67d203e011c5c64b05bceea8f725a7bbb47d80a6 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sat, 11 Jun 2016 11:26:52 -0700 Subject: [PATCH] Catch exception and attempt to reconnect websocket --- plexpy/activity_handler.py | 7 ++++--- plexpy/web_socket.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/plexpy/activity_handler.py b/plexpy/activity_handler.py index e20463b1..08bb2327 100644 --- a/plexpy/activity_handler.py +++ b/plexpy/activity_handler.py @@ -48,9 +48,10 @@ class ActivityHandler(object): pms_connect = pmsconnect.PmsConnect() session_list = pms_connect.get_current_activity() - for session in session_list['sessions']: - if int(session['session_key']) == self.get_session_key(): - return session + if session_list: + for session in session_list['sessions']: + if int(session['session_key']) == self.get_session_key(): + return session return None diff --git a/plexpy/web_socket.py b/plexpy/web_socket.py index 1f8dc158..451dee60 100644 --- a/plexpy/web_socket.py +++ b/plexpy/web_socket.py @@ -86,7 +86,7 @@ def run(): # successfully received data, reset reconnects counter reconnects = 0 - except websocket.WebSocketConnectionClosedException: + except (websocket.WebSocketConnectionClosedException, Exception): if reconnects <= 15: reconnects += 1 @@ -94,7 +94,7 @@ def run(): if reconnects > 1: time.sleep(5) - logger.warn(u"PlexPy WebSocket :: Connection has closed, reconnecting...") + logger.warn(u"PlexPy WebSocket :: Connection has closed, reconnection attempt %s." % reconnects) try: ws = create_connection(uri, header=header) except IOError as e: