From a82f4c03e749ada328b6031cfd085cab8f38f51c Mon Sep 17 00:00:00 2001 From: Martin Poirier Date: Wed, 29 Jun 2011 19:46:48 +0000 Subject: netrender better stream handling when uploading files Might solve the problem with OS X masters --- netrender/slave.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'netrender/slave.py') diff --git a/netrender/slave.py b/netrender/slave.py index 3976695d..7f72530e 100644 --- a/netrender/slave.py +++ b/netrender/slave.py @@ -86,6 +86,7 @@ def testFile(conn, job_id, slave_id, rfile, JOB_PREFIX, main_path = None): if not found: print("Found file %s at %s but signature mismatch!" % (rfile.filepath, job_full_path)) + os.remove(job_full_path) job_full_path = prefixPath(JOB_PREFIX, rfile.filepath, main_path, force = True) if not found: @@ -258,8 +259,7 @@ def render_slave(engine, netsettings, threads): if stdout: # (only need to update on one frame, they are linked conn.request("PUT", logURL(job.id, first_frame), stdout, headers=headers) - response = conn.getresponse() - response.read() + responseStatus(conn) # Also output on console if netsettings.use_slave_output_log: -- cgit v1.2.3