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

Reconnect websocket on server change

Browse source
This commit is contained in:
JonnyWong16 2016-02-23 19:05:20 -08:00
parent eedd0d9c07
commit 1920c9b7e3
2 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

34
plexpy/web_socket.py
View file

@ -25,6 +25,7 @@ import websocket
name = 'websocket' name = 'websocket'
opcode_data = (websocket.ABNF.OPCODE_TEXT, websocket.ABNF.OPCODE_BINARY) opcode_data = (websocket.ABNF.OPCODE_TEXT, websocket.ABNF.OPCODE_BINARY)
ws_reconnect = False
def start_thread(): def start_thread():
@ -34,6 +35,11 @@ def start_thread():
threading.Thread(target=run).start() threading.Thread(target=run).start()
def reconnect():
global ws_reconnect
ws_reconnect = True
def run(): def run():
from websocket import create_connection from websocket import create_connection
@ -51,19 +57,21 @@ def run():
if plexpy.CONFIG.PMS_TOKEN: if plexpy.CONFIG.PMS_TOKEN:
uri += '?X-Plex-Token=' + plexpy.CONFIG.PMS_TOKEN uri += '?X-Plex-Token=' + plexpy.CONFIG.PMS_TOKEN
global ws_reconnect
ws_reconnect = False
ws_connected = False ws_connected = False
reconnects = 0 reconnects = 0
# Try an open the websocket connection - if it fails after 15 retries fallback to polling # Try an open the websocket connection - if it fails after 15 retries fallback to polling
while not ws_connected and reconnects <= 15: while not ws_connected and reconnects <= 15:
try: try:
logger.info(u'PlexPy WebSocket :: Opening%s websocket, connection attempt %s.' % (secure, str(reconnects + 1))) logger.info(u"PlexPy WebSocket :: Opening%s websocket, connection attempt %s." % (secure, str(reconnects + 1)))
ws = create_connection(uri) ws = create_connection(uri)
reconnects = 0 reconnects = 0
ws_connected = True ws_connected = True
logger.info(u'PlexPy WebSocket :: Ready') logger.info(u"PlexPy WebSocket :: Ready")
except IOError, e: except IOError, e:
logger.error(u'PlexPy WebSocket :: %s.' % e) logger.error(u"PlexPy WebSocket :: %s." % e)
reconnects += 1 reconnects += 1
time.sleep(5) time.sleep(5)
@ -81,22 +89,30 @@ 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, reconnecting...")
try: try:
ws = create_connection(uri) ws = create_connection(uri)
except IOError, e: except IOError, e:
logger.info(u'PlexPy WebSocket :: %s.' % e) logger.info(u"PlexPy WebSocket :: %s." % e)
else: else:
ws.shutdown()
ws_connected = False ws_connected = False
break break
if not ws_connected: # Check if we recieved a restart notification and close websocket connection cleanly
logger.error(u'PlexPy WebSocket :: Connection unavailable, falling back to polling.') if ws_reconnect:
logger.info(u"PlexPy WebSocket :: Reconnecting websocket...")
ws.shutdown()
ws_connected = False
start_thread()
if not ws_connected and not ws_reconnect:
logger.error(u"PlexPy WebSocket :: Connection unavailable, falling back to polling.")
plexpy.POLLING_FAILOVER = True plexpy.POLLING_FAILOVER = True
plexpy.initialize_scheduler() plexpy.initialize_scheduler()
logger.debug(u'PlexPy WebSocket :: Leaving thread.') logger.debug(u"PlexPy WebSocket :: Leaving thread.")
def receive(ws): def receive(ws):
@ -124,7 +140,7 @@ def process(opcode, data):
try: try:
info = json.loads(data) info = json.loads(data)
except Exception as ex: except Exception as ex:
logger.warn(u'PlexPy WebSocket :: Error decoding message from websocket: %s' % ex) logger.warn(u"PlexPy WebSocket :: Error decoding message from websocket: %s" % ex)
logger.debug(data) logger.debug(data)
return False return False

4
plexpy/webserve.py
View file

@ -13,7 +13,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with PlexPy. If not, see <http://www.gnu.org/licenses/>. # along with PlexPy. If not, see <http://www.gnu.org/licenses/>.
from plexpy import logger, notifiers, plextv, pmsconnect, common, log_reader, datafactory, graphs, users, libraries, database from plexpy import logger, notifiers, plextv, pmsconnect, common, log_reader, \
datafactory, graphs, users, libraries, database, web_socket
from plexpy.helpers import checked, addtoapi, get_ip, create_https_certificates from plexpy.helpers import checked, addtoapi, get_ip, create_https_certificates
from mako.lookup import TemplateLookup from mako.lookup import TemplateLookup
@ -1327,6 +1328,7 @@ class WebInterface(object):
if server_changed: if server_changed:
plextv.get_real_pms_url() plextv.get_real_pms_url()
pmsconnect.get_server_friendly_name() pmsconnect.get_server_friendly_name()
web_socket.reconnect()
# Reconfigure scheduler if intervals changed # Reconfigure scheduler if intervals changed
if reschedule: if reschedule: