Reoo88 commited on
Commit
4ebb109
·
verified ·
1 Parent(s): a659c65

cap MAX_CONCURRENT_RELAYS=2 (env, not a promise); health youtube fields; relay-only verify

Browse files
Files changed (1) hide show
  1. app.py +25 -2
app.py CHANGED
@@ -794,9 +794,17 @@ def health_public():
794
  last_error, last_error_user=_pick_last_error(tasks)
795
  users=list(tasks.items())
796
  active=hub.active_count()
 
 
 
 
 
 
 
797
  per=[]
798
  for u,tsk in users:
799
  rs=_relay_snapshot(u)
 
800
  per.append({'username':u,'status':tsk.get('state') or '',
801
  'last_data_time':rs.get('last_data_time'),
802
  'bytes_received':rs.get('bytes_received') or 0,
@@ -805,7 +813,10 @@ def health_public():
805
  'restarts':rs.get('restarts') or 0,'dest':rs.get('relay_dest') or '',
806
  'last_error':tsk.get('last_error') or '','source_age':rs.get('source_age'),
807
  'output_seconds':rs.get('output_seconds') or 0,
808
- 'send_mode':rs.get('send_mode') or ''})
 
 
 
809
  res=resource_snapshot()
810
  mgr=bool(youtube.manager_thread and youtube.manager_thread.is_alive())
811
  y_events=0; y_hist=0; y_senders=0; y_status=''; y_skip=''
@@ -828,6 +839,7 @@ def health_public():
828
  return {'application':'running','monitor':'running' if _monitor_alive.is_set() else 'stopped',
829
  'accounts':n,'enabled':enabled,'active_relays':active,
830
  'max_concurrent_relays':max_concurrent_relays(),
 
831
  'load1':res.get('load1'),'cpus':res.get('cpus'),
832
  'mem_total_mb':res.get('mem_total_mb'),'mem_avail_mb':res.get('mem_avail_mb'),
833
  'quota_cpus':res.get('quota_cpus'),'cpu_cores_used':res.get('cpu_cores_used'),
@@ -891,11 +903,19 @@ def youtube_stop():
891
  @app.get('/api/state')
892
  def state():
893
  with lock:
 
 
 
 
 
 
 
894
  task_list=[]
895
  for u,t in tasks.items():
896
  live_since=t.get('live_since')
897
  live_for=int(time.time()-live_since) if live_since else 0
898
  rs=_relay_snapshot(u)
 
899
  task_list.append({'username':u,'enabled':t.get('enabled'),'status':t.get('status') or '',
900
  'state':t.get('state') or 'OFFLINE','quality':t.get('quality') or '',
901
  'source':t.get('source') or '','codec':t.get('codec') or '',
@@ -905,7 +925,10 @@ def state():
905
  'relay_pid':rs.get('relay_pid'),'bytes_received':rs.get('bytes_received') or 0,
906
  'last_data_time':rs.get('last_data_time'),'relay_alive':rs.get('relay_alive'),
907
  'session_title':rs.get('session_title') or '','restarts':rs.get('restarts') or 0,
908
- 'youtube_status':'relay' if rs.get('relay_alive') else (t.get('state') or '')})
 
 
 
909
  tiktok_state=tiktok_auth.describe([t['username'] for t in task_list])
910
  active=0
911
  try:active=sum(1 for e in youtube.senders.values() if e.get('thread') and e['thread'].is_alive())
 
794
  last_error, last_error_user=_pick_last_error(tasks)
795
  users=list(tasks.items())
796
  active=hub.active_count()
797
+ yt_health={}
798
+ try:
799
+ for ev in (youtube.snapshot().get('events') or []):
800
+ if ev.get('username'):
801
+ yt_health[ev['username']]=ev
802
+ except Exception:
803
+ yt_health={}
804
  per=[]
805
  for u,tsk in users:
806
  rs=_relay_snapshot(u)
807
+ ye=yt_health.get(u) or {}
808
  per.append({'username':u,'status':tsk.get('state') or '',
809
  'last_data_time':rs.get('last_data_time'),
810
  'bytes_received':rs.get('bytes_received') or 0,
 
813
  'restarts':rs.get('restarts') or 0,'dest':rs.get('relay_dest') or '',
814
  'last_error':tsk.get('last_error') or '','source_age':rs.get('source_age'),
815
  'output_seconds':rs.get('output_seconds') or 0,
816
+ 'send_mode':rs.get('send_mode') or '',
817
+ 'youtube_health':str(ye.get('youtube_health') or ''),
818
+ 'youtube_issues':str(ye.get('youtube_issues') or '')[:120],
819
+ 'youtube_status':str(ye.get('youtube_status') or '')})
820
  res=resource_snapshot()
821
  mgr=bool(youtube.manager_thread and youtube.manager_thread.is_alive())
822
  y_events=0; y_hist=0; y_senders=0; y_status=''; y_skip=''
 
839
  return {'application':'running','monitor':'running' if _monitor_alive.is_set() else 'stopped',
840
  'accounts':n,'enabled':enabled,'active_relays':active,
841
  'max_concurrent_relays':max_concurrent_relays(),
842
+ 'source_stall_timeout':SOURCE_STALL_TIMEOUT,
843
  'load1':res.get('load1'),'cpus':res.get('cpus'),
844
  'mem_total_mb':res.get('mem_total_mb'),'mem_avail_mb':res.get('mem_avail_mb'),
845
  'quota_cpus':res.get('quota_cpus'),'cpu_cores_used':res.get('cpu_cores_used'),
 
903
  @app.get('/api/state')
904
  def state():
905
  with lock:
906
+ yt_health={}
907
+ try:
908
+ for ev in (youtube.snapshot().get('events') or []):
909
+ if ev.get('username'):
910
+ yt_health[ev['username']]=ev
911
+ except Exception:
912
+ yt_health={}
913
  task_list=[]
914
  for u,t in tasks.items():
915
  live_since=t.get('live_since')
916
  live_for=int(time.time()-live_since) if live_since else 0
917
  rs=_relay_snapshot(u)
918
+ ye=yt_health.get(u) or {}
919
  task_list.append({'username':u,'enabled':t.get('enabled'),'status':t.get('status') or '',
920
  'state':t.get('state') or 'OFFLINE','quality':t.get('quality') or '',
921
  'source':t.get('source') or '','codec':t.get('codec') or '',
 
925
  'relay_pid':rs.get('relay_pid'),'bytes_received':rs.get('bytes_received') or 0,
926
  'last_data_time':rs.get('last_data_time'),'relay_alive':rs.get('relay_alive'),
927
  'session_title':rs.get('session_title') or '','restarts':rs.get('restarts') or 0,
928
+ 'source_age':rs.get('source_age'),
929
+ 'youtube_health':str(ye.get('youtube_health') or ''),
930
+ 'youtube_issues':str(ye.get('youtube_issues') or '')[:120],
931
+ 'youtube_status':str(ye.get('youtube_status') or ('relay' if rs.get('relay_alive') else (t.get('state') or '')))})
932
  tiktok_state=tiktok_auth.describe([t['username'] for t in task_list])
933
  active=0
934
  try:active=sum(1 for e in youtube.senders.values() if e.get('thread') and e['thread'].is_alive())