[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25784] trunk/blender/release/scripts/io/ netrender/master.py: netrender: Ctrl-C correctly stops master in background mode ( low level select was catching the break and spiting and exception)
Martin Poirier
theeth at yahoo.com
Wed Jan 6 21:17:28 CET 2010
Revision: 25784
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25784
Author: theeth
Date: 2010-01-06 21:17:27 +0100 (Wed, 06 Jan 2010)
Log Message:
-----------
netrender: Ctrl-C correctly stops master in background mode (low level select was catching the break and spiting and exception)
Modified Paths:
--------------
trunk/blender/release/scripts/io/netrender/master.py
Modified: trunk/blender/release/scripts/io/netrender/master.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/master.py 2010-01-06 20:16:01 UTC (rev 25783)
+++ trunk/blender/release/scripts/io/netrender/master.py 2010-01-06 20:17:27 UTC (rev 25784)
@@ -19,6 +19,7 @@
import sys, os
import http, http.client, http.server, urllib, socket
import subprocess, shutil, time, hashlib
+import select # for select.error
from netrender.utils import *
import netrender.model
@@ -928,7 +929,10 @@
start_time = time.time()
while not test_break():
- httpd.handle_request()
+ try:
+ httpd.handle_request()
+ except select.error:
+ pass
if time.time() - start_time >= 10: # need constant here
httpd.timeoutSlaves()
More information about the Bf-blender-cvs
mailing list