summaryrefslogtreecommitdiff
path: root/src/flufigut.py
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2013-09-11 01:11:44 +0200
committerChristian Pointner <equinox@spreadspace.org>2013-09-11 01:11:44 +0200
commit3206b9a90c0f7f678716060ed1fbdea0a5f3737f (patch)
tree8fa6ebb9f07294030ed46e739103049610bbf403 /src/flufigut.py
parentswitch to own converter for mjpeg (diff)
fixed bug where a whole stream cluster gets ignored if no needed worker is assigned to any machine
Diffstat (limited to 'src/flufigut.py')
-rwxr-xr-xsrc/flufigut.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/flufigut.py b/src/flufigut.py
index bdb8737..582f07e 100755
--- a/src/flufigut.py
+++ b/src/flufigut.py
@@ -265,6 +265,10 @@ if output_format == 'flumotion':
port = stream[cluster]['port']
for idx in range(streamer_cnt):
stream_worker = '%s%i'%(cluster, idx+1)
+ if stream_worker not in worker:
+ worker[stream_worker] = -1
+ else:
+ worker[stream_worker] = 1
for machine in globals['machines'].keys():
if stream_worker in globals['machines'][machine]:
if machine in machines:
@@ -282,10 +286,6 @@ if output_format == 'flumotion':
'password': rand_string(size=12),
}
- if stream_worker not in worker:
- worker[stream_worker] = -1
- else:
- worker[stream_worker] = 1
atmosphere['porter-%s-%i'%(machine, port)] = {
'type': "porter",
'desc': "Porter for %s on port %i"%(machine, port),