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

Do not send Plex server down on websocket excpetion

Browse Source
This commit is contained in:
JonnyWong16
2017-12-09 01:54:43 -08:00
parent e353d0518c
commit a00f36f83b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plexpy/web_socket.py
View File

@@ -70,6 +70,7 @@ def run():
global ws_reconnect global ws_reconnect
ws_reconnect = False ws_reconnect = False
reconnects = 0 reconnects = 0
ws_exception = False
# Try an open the websocket connection # Try an open the websocket connection
while not plexpy.WS_CONNECTED and reconnects <= plexpy.CONFIG.WEBSOCKET_CONNECTION_ATTEMPTS: while not plexpy.WS_CONNECTED and reconnects <= plexpy.CONFIG.WEBSOCKET_CONNECTION_ATTEMPTS:
@@ -95,6 +96,7 @@ def run():
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 plexpy.WS_CONNECTED = False
ws_exception = True
break break
while plexpy.WS_CONNECTED: while plexpy.WS_CONNECTED:
@@ -128,6 +130,7 @@ def run():
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 plexpy.WS_CONNECTED = False
ws_exception = True
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
@@ -140,7 +143,7 @@ def run():
if not plexpy.WS_CONNECTED and not ws_reconnect: if not plexpy.WS_CONNECTED and not ws_reconnect:
logger.error(u"PlexPy WebSocket :: Connection unavailable.") logger.error(u"PlexPy WebSocket :: Connection unavailable.")
if plexpy.PLEX_SERVER_UP: if not ws_exception and plexpy.PLEX_SERVER_UP:
logger.info(u"PlexPy WebSocket :: Unable to get an internal response from the server, Plex server is down.") logger.info(u"PlexPy WebSocket :: Unable to get an internal response from the server, Plex server is down.")
plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_intdown'}) plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_intdown'})
plexpy.PLEX_SERVER_UP = False plexpy.PLEX_SERVER_UP = False