From 4ad734a5aa2664e7af0cd758d03dcaf19b20c668 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 9 Oct 2014 18:45:07 +0200 Subject: the rrd plug is now optional --- src/flufigut.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/flufigut.py') diff --git a/src/flufigut.py b/src/flufigut.py index 31a2262..f2ddf90 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -333,8 +333,6 @@ if output_format == 'flumotion': 'desc': "%s streamer for %s %s-%s (part %i of %s cluster)" % (stream[cluster]['type'], mux_name, format, profile, idx+1, cluster), 'worker': stream_worker, 'feeder': feeder, - 'rrd_clients' : "%s/%s_clients.rrd" % (globals['rrd-dir'], name), - 'rrd_bytes' : "%s/%s_bytes.rrd" % (globals['rrd-dir'], name), 'properties': { 'description': globals['description'], 'type': 'slave', @@ -346,6 +344,11 @@ if output_format == 'flumotion': 'port': port, } } + if 'rrd-dir' in globals.keys(): + flow['streamer'][name]['rrd_dir'] = globals['rrd-dir'], name + flow['streamer'][name]['rrd_clients'] = "%s/%s_clients.rrd" % (globals['rrd-dir'], name) + flow['streamer'][name]['rrd_bytes'] = "%s/%s_bytes.rrd" % (globals['rrd-dir'], name) + for prop in stream[cluster]: if prop == 'max-con': flow['streamer'][name]['properties']['client-limit'] = stream[cluster][prop] -- cgit v1.2.3