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

updates to web sockets

Browse source
This commit is contained in:
brees 2023-10-30 01:10:24 -04:00
commit 7bf04754fa
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/interfaces/default/scheduler_table.html
View file

@ -12,7 +12,7 @@ DOCUMENTATION :: END
<%! <%!
import datetime import datetime
import plexpy import plexpy
from plexpy import common, helpers from plexpy import common, helpers, web_socket
scheduled_jobs = [j.id for j in plexpy.SCHED.get_jobs()] scheduled_jobs = [j.id for j in plexpy.SCHED.get_jobs()]
%> %>
@ -41,7 +41,7 @@ DOCUMENTATION :: END
<td>${helpers.format_timedelta_Hms(sched_job.next_run_time - now)}</td> <td>${helpers.format_timedelta_Hms(sched_job.next_run_time - now)}</td>
<td>${sched_job.next_run_time.astimezone(plexpy.SYS_TIMEZONE).strftime('%Y-%m-%d %H:%M:%S')}</td> <td>${sched_job.next_run_time.astimezone(plexpy.SYS_TIMEZONE).strftime('%Y-%m-%d %H:%M:%S')}</td>
</tr> </tr>
% elif job_type == 'websocket' and plexpy.WS_CONNECTED: % elif job_type == 'websocket' and web_socket.isServerUp():
<tr> <tr>
% if job == 'Check for active sessions': % if job == 'Check for active sessions':
<td><a class="queue-modal-link no-highlight" href="#" data-queue="active sessions">${job}</a></td> <td><a class="queue-modal-link no-highlight" href="#" data-queue="active sessions">${job}</a></td>

9
plexpy/web_socket.py
View file

@ -53,10 +53,14 @@ opcode_data = (websocket.ABNF.OPCODE_TEXT, websocket.ABNF.OPCODE_BINARY)
ws_shutdown = False ws_shutdown = False
pong_timer = None pong_timer = None
pong_count = 0 pong_count = 0
ws_list = []
def isServerUp(): def isServerUp():
return True for ws in ws_list:
if ws.WS_CONNECTED:
return True
return False
def start_threads(): def start_threads():
try: try:
@ -71,7 +75,7 @@ def start_threads():
owned_servers = server_manager.ServerManger().get_server_list() owned_servers = server_manager.ServerManger().get_server_list()
global ws_list
# Start each websocket listener on it's own thread per server # Start each websocket listener on it's own thread per server
for owned_server in owned_servers: for owned_server in owned_servers:
for server in plex_servers: for server in plex_servers:
@ -79,6 +83,7 @@ def start_threads():
for connection in server['connections']: for connection in server['connections']:
if connection['local']: if connection['local']:
wss=WebSocketServer(connection, owned_server.server_id) wss=WebSocketServer(connection, owned_server.server_id)
ws_list.append(wss)
thread = threading.Thread(target=wss.run) thread = threading.Thread(target=wss.run)
thread.daemon = True thread.daemon = True
thread.start() thread.start()