Trysdyn Black
a3c273bad4
De-duping those additions seems like a good idea, but we found out that in some cases, OME will emit open and closes for streams while they're still live. De-duping those resulted in streams erroneously being removed from the live list. One such scenario is someone trying to "Steal" and already live key. OME will emit an open and an immediate close as the connection is rejected. The close was removing the still-live stream from the list. Fixes #9
44 lines
1.4 KiB
Python
44 lines
1.4 KiB
Python
import cherrypy
|
|
|
|
import config
|
|
import ovenapi
|
|
|
|
|
|
class Status:
|
|
def _cp_dispatch(self, vpath):
|
|
if len(vpath):
|
|
cherrypy.request.params["vhost"] = vpath.pop(0)
|
|
if len(vpath):
|
|
cherrypy.request.params["app"] = vpath.pop(0)
|
|
if len(vpath):
|
|
cherrypy.request.params["stream"] = vpath.pop(0)
|
|
|
|
return self
|
|
|
|
def __init__(self):
|
|
self.api = ovenapi.get_api_handle(username=config.API_USER, password=config.API_PASS)
|
|
|
|
@cherrypy.expose
|
|
@cherrypy.tools.json_out()
|
|
def index(self, **params: dict):
|
|
vhost = str(params.get("vhost"))
|
|
app = str(params.get("app"))
|
|
# App status
|
|
if "app" in params:
|
|
streams = []
|
|
|
|
# Use config.LAST_STREAM_LIST here because this is a cache of the last
|
|
# stream list the last time the list of streams changed. It should be
|
|
# accurate.
|
|
# We de-dupe because the cached list can end up with duplicates but
|
|
# in all cases, one live entry should mean that stream is live.
|
|
for s_vhost, s_app, s_stream in config.LAST_STREAM_LIST:
|
|
if s_vhost == vhost and s_app == app and s_stream not in streams:
|
|
streams.append(s_stream)
|
|
return streams
|
|
|
|
if "vhost" not in params:
|
|
vhost = "default"
|
|
|
|
# Vhost status
|
|
return self.api.get_vhost_stats(vhost)
|