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

Initialize scheduler to reconnect websocket when failed on startup

Browse Source
This commit is contained in:
JonnyWong16
2017-08-13 09:44:15 -07:00
parent 21309ba280
commit a0799e8197
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PlexPy.py
View File

@@ -193,6 +193,7 @@ def main():
web_socket.start_thread() web_socket.start_thread()
except: except:
logger.warn(u"Websocket :: Unable to open connection.") logger.warn(u"Websocket :: Unable to open connection.")
plexpy.initialize_scheduler()
# Force the http port if neccessary # Force the http port if neccessary
if args.port: if args.port:

5
plexpy/activity_handler.py
View File

@@ -80,8 +80,9 @@ class ActivityHandler(object):
if not session: if not session:
return return
logger.debug(u"PlexPy ActivityHandler :: Session %s started by user %s with ratingKey %s." logger.debug(u"PlexPy ActivityHandler :: Session %s started by user %s (%) with ratingKey %s (%s)."
% (str(session['session_key']), str(session['user_id']), str(session['rating_key']))) % (str(session['session_key']), str(session['user_id']), session['username'],
str(session['rating_key']), session['full_title']))
plexpy.NOTIFY_QUEUE.put({'stream_data': session, 'notify_action': 'on_play'}) plexpy.NOTIFY_QUEUE.put({'stream_data': session, 'notify_action': 'on_play'})

2
plexpy/activity_pinger.py
View File

@@ -41,7 +41,7 @@ def check_active_sessions(ws_request=False):
session_list = pms_connect.get_current_activity() session_list = pms_connect.get_current_activity()
monitor_db = database.MonitorDatabase() monitor_db = database.MonitorDatabase()
monitor_process = activity_processor.ActivityProcessor() monitor_process = activity_processor.ActivityProcessor()
# logger.debug(u"PlexPy Monitor :: Checking for active streams.") logger.debug(u"PlexPy Monitor :: Checking for active streams.")
if session_list: if session_list:
media_container = session_list['sessions'] media_container = session_list['sessions']

2
plexpy/web_socket.py
View File

@@ -100,7 +100,7 @@ def run():
# successfully received data, reset reconnects counter # successfully received data, reset reconnects counter
reconnects = 0 reconnects = 0
except (websocket.WebSocketConnectionClosedException, Exception): except websocket.WebSocketConnectionClosedException:
if reconnects <= plexpy.CONFIG.WEBSOCKET_CONNECTION_ATTEMPTS: if reconnects <= plexpy.CONFIG.WEBSOCKET_CONNECTION_ATTEMPTS:
reconnects += 1 reconnects += 1