From d1053424293b1ad62e94ad2f58e331d3ed0d75dd Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 28 Jun 2018 14:10:14 +0200 Subject: [PATCH] Use settings.TELECASTER_LIVE_STREAMING_SERVER, adapt urls to unique streaming server with 2 proxies and HTTPS --- teleforma/models/core.py | 8 +++++--- teleforma/views/core.py | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/teleforma/models/core.py b/teleforma/models/core.py index 814267b7..48c12647 100644 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -474,10 +474,12 @@ class LiveStream(Model): @property def mount_point(self): + mount_point = self.server.type if self.server.type == 'stream-m': - return 'consume/' + self.slug + mount_point += '/consume/' + self.slug else: - return self.slug + '.' + self.stream_type + mount_point += '/' + self.slug + '.' + self.stream_type + return mount_point @property def snapshot_url(self): @@ -489,7 +491,7 @@ class LiveStream(Model): @property def url(self): - return 'http://' + self.server.host + ':' + self.server.port + '/' + self.mount_point + return '//' + self.server.host + ':' + self.server.port + '/' + self.mount_point def __unicode__(self): if self.conference: diff --git a/teleforma/views/core.py b/teleforma/views/core.py index 7d8e36f2..a7cd04fd 100644 --- a/teleforma/views/core.py +++ b/teleforma/views/core.py @@ -719,11 +719,12 @@ class ConferenceRecordView(FormView): for stream in conf_dict['streams']: host = stream['host'] + host = settings.TELECASTER_LIVE_STREAMING_SERVER port = stream['port'] server_type = stream['server_type'] stream_type = stream['stream_type'] - site = Site.objects.all()[0] - server, c = StreamingServer.objects.get_or_create(host=site, + #site = Site.objects.all()[0] + server, c = StreamingServer.objects.get_or_create(host=host, port=port, type=server_type) stream = LiveStream(conference=conference, server=server, -- 2.39.5