Use settings.TELECASTER_LIVE_STREAMING_SERVER, adapt urls to unique streaming server...

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index 207ddb1126c640245f75b7d2273210d478e3da23..063a4b0e892ae45d6cd618cd371c7387c4233d77 100644 (file)
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -418,10 +418,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):
@@ -433,7 +435,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 a6f9965acf04a91fcecb89dd7c01ceecafd0195d..a0e1575226fdcf74f9d0198b0f5ebef2d64fbdde 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -605,11 +605,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,