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

Explicitly assign websocket state

Browse Source
This commit is contained in:
JonnyWong16
2017-08-18 10:57:02 -07:00
parent a0799e8197
commit 9058c5accb
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plexpy/web_socket.py
View File

@@ -86,12 +86,15 @@ def run():
plexpy.PLEX_SERVER_UP = True plexpy.PLEX_SERVER_UP = True
plexpy.initialize_scheduler() plexpy.initialize_scheduler()
except IOError as e: except IOError as e:
logger.error(u"PlexPy WebSocket :: %s." % e) logger.error(u"PlexPy WebSocket :: %s." % e)
reconnects += 1 reconnects += 1
time.sleep(plexpy.CONFIG.WEBSOCKET_CONNECTION_TIMEOUT) time.sleep(plexpy.CONFIG.WEBSOCKET_CONNECTION_TIMEOUT)
except (websocket.WebSocketException, Exception) as e: except (websocket.WebSocketException, Exception) as e:
logger.error(u"PlexPy WebSocket :: %s." % e) logger.error(u"PlexPy WebSocket :: %s." % e)
plexpy.WS_CONNECTED = False
break break
while plexpy.WS_CONNECTED: while plexpy.WS_CONNECTED:
@@ -100,6 +103,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:
if reconnects <= plexpy.CONFIG.WEBSOCKET_CONNECTION_ATTEMPTS: if reconnects <= plexpy.CONFIG.WEBSOCKET_CONNECTION_ATTEMPTS:
reconnects += 1 reconnects += 1
@@ -112,6 +116,7 @@ def run():
try: try:
ws = create_connection(uri, header=header) ws = create_connection(uri, header=header)
logger.info(u"PlexPy WebSocket :: Ready") logger.info(u"PlexPy WebSocket :: Ready")
plexpy.WS_CONNECTED = True
except IOError as e: except IOError as e:
logger.info(u"PlexPy WebSocket :: %s." % e) logger.info(u"PlexPy WebSocket :: %s." % e)
@@ -119,8 +124,10 @@ def run():
ws.shutdown() ws.shutdown()
plexpy.WS_CONNECTED = False plexpy.WS_CONNECTED = False
break break
except (websocket.WebSocketException, Exception) as e: except (websocket.WebSocketException, Exception) as e:
logger.error(u"PlexPy WebSocket :: %s." % e) logger.error(u"PlexPy WebSocket :: %s." % e)
plexpy.WS_CONNECTED = False
break break
# Check if we recieved a restart notification and close websocket connection cleanly # Check if we recieved a restart notification and close websocket connection cleanly