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

Catch exception and attempt to reconnect websocket

Browse source
This commit is contained in:
JonnyWong16 2016-06-11 11:26:52 -07:00
parent 0d38b3de16
commit 67d203e011
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plexpy/activity_handler.py
View file

@ -48,9 +48,10 @@ class ActivityHandler(object):
pms_connect = pmsconnect.PmsConnect() pms_connect = pmsconnect.PmsConnect()
session_list = pms_connect.get_current_activity() session_list = pms_connect.get_current_activity()
for session in session_list['sessions']: if session_list:
if int(session['session_key']) == self.get_session_key(): for session in session_list['sessions']:
return session if int(session['session_key']) == self.get_session_key():
return session
return None return None

4
plexpy/web_socket.py
View file

@ -86,7 +86,7 @@ def run():
# successfully received data, reset reconnects counter # successfully received data, reset reconnects counter
reconnects = 0 reconnects = 0
except websocket.WebSocketConnectionClosedException: except (websocket.WebSocketConnectionClosedException, Exception):
if reconnects <= 15: if reconnects <= 15:
reconnects += 1 reconnects += 1
@ -94,7 +94,7 @@ def run():
if reconnects > 1: if reconnects > 1:
time.sleep(5) 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: try:
ws = create_connection(uri, header=header) ws = create_connection(uri, header=header)
except IOError as e: except IOError as e: