diff options
author | Martin Poirier <theeth@yahoo.com> | 2010-01-06 23:17:27 +0300 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2010-01-06 23:17:27 +0300 |
commit | 59ec8ee1abebf32fbec7201d430114fd3038ab80 (patch) | |
tree | 0dc70dd488fc453e224b31acd42b97be9f86e74e /release/scripts | |
parent | 0cc7b5800c0bf3ce642da11c72fc22e5dbc31393 (diff) |
netrender: Ctrl-C correctly stops master in background mode (low level select was catching the break and spiting and exception)
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/io/netrender/master.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/release/scripts/io/netrender/master.py b/release/scripts/io/netrender/master.py index f27d738d54a..4b21221d3af 100644 --- a/release/scripts/io/netrender/master.py +++ b/release/scripts/io/netrender/master.py @@ -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 @@ def runMaster(address, broadcast, clear, path, update_stats, test_break): 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() |