anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix websocket not scheduling reconnect

Browse Source
This commit is contained in:
JonnyWong16
2018-03-22 21:03:11 -07:00
parent 35914b9a48
commit 502b807e45
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plexpy/web_socket.py
View File

@@ -74,7 +74,7 @@ def on_disconnect():
def reconnect(): def reconnect():
shutdown() close()
logger.info(u"Tautulli WebSocket :: Reconnecting websocket...") logger.info(u"Tautulli WebSocket :: Reconnecting websocket...")
start_thread() start_thread()
@@ -82,7 +82,10 @@ def reconnect():
def shutdown(): def shutdown():
global ws_shutdown global ws_shutdown
ws_shutdown = True ws_shutdown = True
close()
def close():
logger.info(u"Tautulli WebSocket :: Disconnecting websocket...") logger.info(u"Tautulli WebSocket :: Disconnecting websocket...")
plexpy.WEBSOCKET.close() plexpy.WEBSOCKET.close()
plexpy.WS_CONNECTED = False plexpy.WS_CONNECTED = False
@@ -129,7 +132,7 @@ def run():
logger.info(u"Tautulli WebSocket :: Ready") logger.info(u"Tautulli WebSocket :: Ready")
plexpy.WS_CONNECTED = True plexpy.WS_CONNECTED = True
except (websocket.WebSocketException, IOError, Exception) as e: except (websocket.WebSocketException, IOError, Exception) as e:
logger.error(u"Tautulli WebSocket :: %s." % e) logger.error("Tautulli WebSocket :: %s." % e)
if plexpy.WS_CONNECTED: if plexpy.WS_CONNECTED:
on_connect() on_connect()
@@ -165,7 +168,7 @@ def run():
logger.error("Tautulli WebSocket :: %s." % e) logger.error("Tautulli WebSocket :: %s." % e)
else: else:
shutdown() close()
break break
except (websocket.WebSocketException, Exception) as e: except (websocket.WebSocketException, Exception) as e:
@@ -173,7 +176,7 @@ def run():
break break
logger.error("Tautulli WebSocket :: %s." % e) logger.error("Tautulli WebSocket :: %s." % e)
shutdown() close()
break break
if not plexpy.WS_CONNECTED and not ws_shutdown: if not plexpy.WS_CONNECTED and not ws_shutdown: