diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2014-10-11 17:38:13 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2014-10-11 17:38:13 +0200 |
| commit | 95346385f0b6e36050c4bc5fa3f00aadc0c5fbcf (patch) | |
| tree | 51694ae9829072147cc0377d617ffabc66ec7f8a /src/flufigut.py | |
| parent | updated copyright notice (diff) | |
redone http plugs, added support for sfive
Diffstat (limited to 'src/flufigut.py')
| -rwxr-xr-x | src/flufigut.py | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/flufigut.py b/src/flufigut.py index f29deb3..83e1220 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -403,10 +403,23 @@ 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) + + if 'stats' in globals.keys(): + flow['streamer'][name]['plugs'] = {} + if 'rrd' in globals['stats'].keys(): + flow['streamer'][name]['plugs']['rrd'] = {} + flow['streamer'][name]['plugs']['rrd']['clients'] = "%s/%s_clients.rrd" % (globals['stats']['rrd']['directory'], name) + flow['streamer'][name]['plugs']['rrd']['bytes'] = "%s/%s_bytes.rrd" % (globals['stats']['rrd']['directory'], name) + + if 'sfive' in globals['stats'].keys(): + flow['streamer'][name]['plugs']['sfive'] = {} + flow['streamer'][name]['plugs']['sfive']['socket'] = globals['stats']['sfive']['socket'] + flow['streamer'][name]['plugs']['sfive']['duration'] = globals['stats']['sfive']['duration'] + flow['streamer'][name]['plugs']['sfive']['tags'] = globals['stats']['sfive']['tags'] + flow['streamer'][name]['plugs']['sfive']['hostname'] = '%s-%s%i' % (stream[cluster]['type'], cluster, idx+1) + flow['streamer'][name]['plugs']['sfive']['content-id'] = mux_name + flow['streamer'][name]['plugs']['sfive']['format'] = format + flow['streamer'][name]['plugs']['sfive']['quality'] = profile for prop in stream[cluster]: if prop == 'max-con': |