From 18856921b3d3ffe54ef571929e79abea3847096d Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 31 Jan 2018 10:21:07 +0100 Subject: nicer naming scheme for streamer and porter --- src/flufigut.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/flufigut.py') diff --git a/src/flufigut.py b/src/flufigut.py index 99631de..1f25c7a 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -311,17 +311,20 @@ class Planet: # # streams - def __create_porter(self, stream, idx, port, interface=None): - comp_name = 'port-%s%i-%i' % (stream, idx + 1, port) + def __create_porter(self, protocol, stream, idx, port, interface=None): + if protocol != "http": + raise Exception("unknown porter protocol '%s', currently only http porters are supported" % protocol) + + comp_name = '%s-%s%i-port-%i' % (protocol, stream, idx + 1, port) addr = '*:%i' % (port) if interface: - comp_name = 'port-%s%i-%s-%i' % (stream, idx + 1, interface, port) + comp_name = '%s-%s%i-port-%s-%i' % (protocol, stream, idx + 1, interface, port) addr = '%s:%i' % (interface, port) porter = Porter(comp_name, interface, port) self.atmosphere[porter.name] = { 'type': "porter", - 'desc': "Porter for %s%i on %s" % (stream, idx + 1, addr), + 'desc': "%s porter %s%i on %s" % (protocol, stream, idx + 1, addr), 'worker': self.__get_worker(comp_name), 'properties': { 'port': port, @@ -336,7 +339,7 @@ class Planet: return porter def __generate_stream_mux_repeater(self, stream, mux, format, profile, feeder): - comp_name = 'repeater-%s-%s-%s-%s' % (stream, mux, format, profile) + comp_name = 'repeat-%s-%s-%s-%s' % (stream, mux, format, profile) if comp_name in self.flow['repeaters']: return comp_name @@ -388,7 +391,7 @@ class Planet: if 'repeater' in stream: feeder = self.__generate_stream_mux_repeater(stream_name, mux, format, profile, muxer_feed) - comp_name = '%s-%s%i-%s-%s-%s' % (stream['type'], stream_name, idx + 1, mux, format, profile) + comp_name = '%s-%s%i-stream-%s-%s-%s' % (stream['type'], stream_name, idx + 1, mux, format, profile) mount_point = '/%s-%s-%s.%s' % (mux, format, profile, self._desc.globals['formats'][format]['muxer']) hostname = stream['hostname'] hostname_next = None @@ -423,7 +426,7 @@ class Planet: interface = None if 'interface' in stream: interface = stream['interface'] - porter = self.__create_porter(stream_name, idx, port, interface) + porter = self.__create_porter(stream['type'], stream_name, idx, port, interface) for mux_name in stream['muxes']: for format_name, format in self._desc.muxes[mux_name]['formats'].items(): for profile_name in format: -- cgit v1.2.3