summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2012-10-11 22:46:36 +0200
committerChristian Pointner <equinox@spreadspace.org>2012-10-11 22:46:36 +0200
commitd8e763e762b402fc40405df456340fd721370997 (patch)
tree031a240e63a9642101db8df765b1da9637684a75 /src
parentsplitted video/audio encoder to several worker (diff)
renamed worker variable
Diffstat (limited to 'src')
-rwxr-xr-xsrc/flufigut.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/flufigut.py b/src/flufigut.py
index 83c4e84..a27060e 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -192,9 +192,9 @@ for cluster in stream.keys():
streamer_cnt = stream[cluster]['count']
port = stream[cluster]['port']
for idx in range(streamer_cnt):
- worker = '%s%i'%(cluster, idx+1)
+ stream_worker = '%s%i'%(cluster, idx+1)
for machine in globals['machines'].keys():
- if worker in globals['machines'][machine]:
+ if stream_worker in globals['machines'][machine]:
if machine in machines:
if 'porter' in machines[machine]:
if port in machines[machine]['porter']:
@@ -213,7 +213,7 @@ for cluster in stream.keys():
atmosphere['porter-%s-%i'%(machine, port)] = {
'type': "porter",
'desc': "Porter for %s on port %i"%(machine, port),
- 'worker': worker,
+ 'worker': stream_worker,
'properties': {
'port': port,
'socket-path': machines[machine]['porter'][port]['socket-path'],
@@ -238,7 +238,7 @@ for cluster in stream.keys():
flow['streamer'][name] = {
'type': "%s-stream" % stream[cluster]['type'],
'desc': "%s streamer for %s-%s (part %i of %s cluster)" % (stream[cluster]['type'], format, profile, idx+1, cluster),
- 'worker': worker,
+ '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),