summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2018-02-18 01:06:52 +0100
committerChristian Pointner <equinox@spreadspace.org>2018-02-18 01:06:52 +0100
commit103d4d71e6a47a6c58bfa7cba80cafd996e1dde1 (patch)
treeb4e83c1d9d81c9a5ca25b91042b1477ee591af09 /src
parentadded sfive hub to proxy (diff)
better hostname for sfive streamer
Diffstat (limited to 'src')
-rwxr-xr-xsrc/flufigut.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/flufigut.py b/src/flufigut.py
index 208d742..1be9ffd 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -543,7 +543,8 @@ class Planet:
self.__set_stream_mux_instance_props(comp_name, stream, porter.port, mount_point, hostname_next)
self.__add_stream_mux_instance_plugs(comp_name, stream_name, idx, mux, format, profile)
self.__add_worker_flag_exclusive(worker, "stream", stream_name)
- self.__add_worker_flag_exclusive(worker, "stream-hostname-%s" % stream_name, hostname)
+ self.__add_worker_flag_exclusive(worker, "stream-hostname", hostname)
+ self.__add_worker_flag_exclusive(worker, "stream-index", idx)
def __generate_stream_instance(self, stream_name, stream, idx, cnt):
port = stream['port']
@@ -722,7 +723,7 @@ class K8sDeployment:
proxy_conf['backends']['/hls/'] = {'connect': 'http://nginx-streamer-' + worker['name'] + ':8000'}
proxy_conf['backends']['/dash/'] = {'connect': 'http://nginx-streamer-' + worker['name'] + ':8000'}
- proxy_conf['sfive'] = {'hostname': worker['name']}
+ proxy_conf['sfive'] = {'hostname': "streamer-%s%d" % (worker['flags']['stream'], (worker['flags']['stream-index'] + 1))}
proxy_conf['sfive']['socket'] = self._desc.globals['stats']['sfive-proxy']['socket']
proxy_conf['sfive']['duration'] = self._desc.globals['stats']['sfive-proxy']['duration']
proxy_conf['sfive']['tags'] = self._desc.globals['stats']['sfive-proxy']['tags']