Mercurial > moin > 1.9
changeset 4063:d996f53790bb
standalone server: use daemon threads so Ctrl-C/kill works better, remove leftover debug code (thanks to Greg Ward for the patch)
author | Thomas Waldmann <tw AT waldmann-edv DOT de> |
---|---|
date | Sun, 31 Aug 2008 23:11:02 +0200 |
parents | e5778919c0a2 |
children | fd4d32812e92 |
files | MoinMoin/server/server_standalone.py |
diffstat | 1 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/MoinMoin/server/server_standalone.py Sun Aug 31 23:03:58 2008 +0200 +++ b/MoinMoin/server/server_standalone.py Sun Aug 31 23:11:02 2008 +0200 @@ -133,6 +133,7 @@ return t = Thread(target=self.process_request_thread, args=(request, client_address)) + t.setDaemon(True) t.start() finally: self.lock.release() @@ -164,11 +165,6 @@ This server is 5 times faster than ThreadingServer for static files, and about the same for wiki pages. - - TODO: sometimes the server won't exit on Conrol-C, and continue to - run with few threads (you can kill it with kill -9). Same problem - exist with the twisted server. When the problem is finally solved, - remove the commented debug prints. """ use_threads = True @@ -186,6 +182,7 @@ from threading import Thread for dummy in range(self.poolSize): t = Thread(target=self.serve_forever_thread) + t.setDaemon(True) t.start() SimpleServer.serve_forever(self) @@ -219,7 +216,6 @@ except: self.handle_error(request, client_address) self.close_request(request) - # sys.stderr.write('thread exiting...\n') def pop_request(self): """ Pop a request from the queue @@ -240,7 +236,6 @@ self.lock.wait() finally: self.lock.release() - # sys.stderr.write('thread exiting...\n') sys.exit() def die(self): @@ -256,7 +251,6 @@ def wake_all_threads(self): self.lock.acquire() try: - # sys.stderr.write('waking up all threads...\n') self.lock.notifyAll() finally: self.lock.release()