diff options
author | ianb <devnull@localhost> | 2007-04-26 17:13:51 +0000 |
---|---|---|
committer | ianb <devnull@localhost> | 2007-04-26 17:13:51 +0000 |
commit | 101dd3e2a93a81a0ab32523e6e4aedc348859d8b (patch) | |
tree | b5e9f7f92ccd59ca5c4bcf5fcd22a0805d2ea9e8 /paste/httpserver.py | |
parent | bf36d220557ee3341b51945234948f437afdd336 (diff) | |
download | paste-101dd3e2a93a81a0ab32523e6e4aedc348859d8b.tar.gz |
Don't register the cleanup until the rest of the threadpool constructor has successfully run
Diffstat (limited to 'paste/httpserver.py')
-rwxr-xr-x | paste/httpserver.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/paste/httpserver.py b/paste/httpserver.py index d7dc190..a39eebb 100755 --- a/paste/httpserver.py +++ b/paste/httpserver.py @@ -566,9 +566,6 @@ class ThreadPool(object): self.error_email = error_email self._worker_count = count() - if not daemon: - atexit.register(self.shutdown) - assert (not kill_thread_limit or kill_thread_limit >= hung_thread_limit), ( "kill_thread_limit (%s) should be higher than hung_thread_limit (%s)" @@ -597,6 +594,8 @@ class ThreadPool(object): # we shouldn't cull extra workers until some time has passed # (hung_thread_limit) since workers were added: self._last_added_new_idle_workers = 0 + if not daemon: + atexit.register(self.shutdown) for i in range(self.nworkers): self.add_worker_thread() |