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

Make websocket failover if no connection can be made on startup or during runtime.

Browse source
This commit is contained in:
Tim 2015-09-20 13:39:04 +02:00
parent fa71beb03f
commit fa25809e7a
2 changed files with 29 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plexpy/__init__.py
View file

@ -71,6 +71,7 @@ COMMITS_BEHIND = None
UMASK = None UMASK = None
POLLING_FAILOVER = False
def initialize(config_file): def initialize(config_file):
with INIT_LOCK: with INIT_LOCK:
@ -80,6 +81,7 @@ def initialize(config_file):
global CURRENT_VERSION global CURRENT_VERSION
global LATEST_VERSION global LATEST_VERSION
global UMASK global UMASK
global POLLING_FAILOVER
CONFIG = plexpy.config.Config(config_file) CONFIG = plexpy.config.Config(config_file)
@ -281,7 +283,7 @@ def initialize_scheduler():
schedule_job(plextv.get_real_pms_url, 'Refresh Plex Server URLs', hours=12, minutes=0, seconds=0) schedule_job(plextv.get_real_pms_url, 'Refresh Plex Server URLs', hours=12, minutes=0, seconds=0)
# If we're not using websockets then fall back to polling # If we're not using websockets then fall back to polling
if not CONFIG.MONITORING_USE_WEBSOCKET: if not CONFIG.MONITORING_USE_WEBSOCKET or POLLING_FAILOVER:
schedule_job(monitor.check_active_sessions, 'Check for active sessions', schedule_job(monitor.check_active_sessions, 'Check for active sessions',
hours=0, minutes=0, seconds=seconds) hours=0, minutes=0, seconds=seconds)

30
plexpy/web_socket.py
View file

@ -43,12 +43,23 @@ 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
ws = create_connection(uri) ws_connected = False
reconnects = 0 reconnects = 0
logger.debug(u'PlexPy WebSocket :: Ready')
while True: # Try an open the websocket connection - if it fails after 5 retries fallback to polling
while not ws_connected and reconnects < 5:
try:
logger.info(u'PlexPy WebSocket :: Opening websocket, connection attempt %s.' % str(reconnects + 1))
ws = create_connection(uri)
reconnects = 0
ws_connected = True
logger.debug(u'PlexPy WebSocket :: Ready')
except IOError, e:
logger.info(u'PlexPy WebSocket :: %s.' % e)
reconnects += 1
time.sleep(5)
while ws_connected:
try: try:
process(*receive(ws)) process(*receive(ws))
@ -63,11 +74,20 @@ def run():
time.sleep(2 * (reconnects - 1)) time.sleep(2 * (reconnects - 1))
logger.info(u'PlexPy WebSocket :: Connection has closed, reconnecting...') logger.info(u'PlexPy WebSocket :: Connection has closed, reconnecting...')
try:
ws = create_connection(uri) ws = create_connection(uri)
except IOError, e:
logger.info(u'PlexPy WebSocket :: %s.' % e)
else: else:
logger.error(u'PlexPy WebSocket :: Connection unavailable, activity monitoring not available') ws_connected = False
break break
if not ws_connected:
logger.error(u'PlexPy WebSocket :: Connection unavailable, falling back to polling.')
plexpy.POLLING_FAILOVER = True
plexpy.initialize_scheduler()
logger.debug(u'Leaving thread.') logger.debug(u'Leaving thread.')