From b9ed72192731485ea39711a89ac69e32f823878a Mon Sep 17 00:00:00 2001
From: Martin Poirier <theeth@yahoo.com>
Date: Sat, 2 Apr 2011 17:53:15 +0000
Subject: [PATCH] netrender: fix bad statusline error on render
---
netrender/master.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/netrender/master.py b/netrender/master.py
index 793e3bb51..b34509e3e 100644
--- a/netrender/master.py
+++ b/netrender/master.py
@@ -741,9 +741,6 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
elif self.path == "/render":
self.server.stats("", "Receiving render result")
- # need some message content here or the slave doesn't like it
- self.wfile.write(bytes("foo", encoding='utf8'))
-
slave_id = self.headers['slave-id']
slave = self.server.getSeenSlave(slave_id)
@@ -784,6 +781,8 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
job.testFinished()
self.send_head()
+ # need some message content here or the slave doesn't like it
+ self.wfile.write(bytes("foo", encoding='utf8'))
else: # frame not found
self.send_head(http.client.NO_CONTENT)
else: # job not found
@@ -794,9 +793,6 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
elif self.path == "/thumb":
self.server.stats("", "Receiving thumbnail result")
- # need some message content here or the slave doesn't like it
- self.wfile.write(bytes("foo", encoding='utf8'))
-
slave_id = self.headers['slave-id']
slave = self.server.getSeenSlave(slave_id)
@@ -821,6 +817,9 @@ class RenderHandler(http.server.BaseHTTPRequestHandler):
del buf
+ self.send_head()
+ # need some message content here or the slave doesn't like it
+ self.wfile.write(bytes("foo", encoding='utf8'))
else: # frame not found
self.send_head(http.client.NO_CONTENT)
else: # job not found
--
GitLab