Skip to content
Snippets Groups Projects
Unverified Commit eda8bf28 authored by Magdalena Noffke's avatar Magdalena Noffke Committed by GitHub
Browse files

Fixes for streamer (#35)

* Don't try to stop streamer if streamer id does not exists

* Always start BBBRoom before streamer
parent e2dd6080
Branches
Tags
No related merge requests found
......@@ -34,12 +34,14 @@ def create_streamer_for_event(event):
'event_id': event.id,
})
return
bbb_room = event.media_tag.bbb_room
if not bbb_room:
if not event.media_tag.bbb_room:
success = event.check_and_create_bbb_room()
if not success:
logger.error('BBB Streaming: Could not create a streamer for event because no BBBRoom exists for it!', extra={
'event_id': event.id,
})
return
bbb_room = event.media_tag.bbb_room
stream_url = event.stream_url.strip()
if not stream_url.endswith('/'):
stream_url += '/'
......@@ -74,6 +76,7 @@ def start_streamer_for_event(event):
'event_id': event.id,
})
return
event.check_and_create_bbb_room()
ret = start_streamer(event.settings.get(SETTINGS_STREAMER_ID))
if ret is True:
event.settings[SETTINGS_STREAMER_RUNNING] = True
......@@ -164,6 +167,7 @@ def trigger_streamer_status_changes(events=None):
# events which have streamer settings still will be stopped/deleted *even if* their `enable_streaming`
# is set to false, so we can stop streams that have just had their streaming disabled but are still running
if event.settings.get(SETTINGS_STREAMER_RUNNING, None) and \
event.settings.get(SETTINGS_STREAMER_ID, None) and \
(event.enable_streaming == False or not event.streaming_allowed or stop_delete_time <= now() or now() <= start_time):
try:
stop_streamer_for_event(event)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment