diff --git a/PlexPy.py b/PlexPy.py index 91a0c1b4..c5ec2373 100755 --- a/PlexPy.py +++ b/PlexPy.py @@ -193,6 +193,7 @@ def main(): web_socket.start_thread() except: logger.warn(u"Websocket :: Unable to open connection.") + plexpy.initialize_scheduler() # Force the http port if neccessary if args.port: diff --git a/plexpy/activity_handler.py b/plexpy/activity_handler.py index b40bb5aa..92ce7965 100644 --- a/plexpy/activity_handler.py +++ b/plexpy/activity_handler.py @@ -80,8 +80,9 @@ class ActivityHandler(object): if not session: return - logger.debug(u"PlexPy ActivityHandler :: Session %s started by user %s with ratingKey %s." - % (str(session['session_key']), str(session['user_id']), str(session['rating_key']))) + logger.debug(u"PlexPy ActivityHandler :: Session %s started by user %s (%) with ratingKey %s (%s)." + % (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'}) diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index b8744b78..629d9a9b 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -41,7 +41,7 @@ def check_active_sessions(ws_request=False): session_list = pms_connect.get_current_activity() monitor_db = database.MonitorDatabase() 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: media_container = session_list['sessions'] diff --git a/plexpy/web_socket.py b/plexpy/web_socket.py index 3d7160a2..18f764ae 100644 --- a/plexpy/web_socket.py +++ b/plexpy/web_socket.py @@ -100,7 +100,7 @@ def run(): # successfully received data, reset reconnects counter reconnects = 0 - except (websocket.WebSocketConnectionClosedException, Exception): + except websocket.WebSocketConnectionClosedException: if reconnects <= plexpy.CONFIG.WEBSOCKET_CONNECTION_ATTEMPTS: reconnects += 1