diff options
author | Chris Dent <chris.dent@gmail.com> | 2018-10-23 13:44:19 +0000 |
---|---|---|
committer | Chris Dent <chris.dent@gmail.com> | 2018-10-23 13:44:19 +0000 |
commit | 045bd6b097722f43359c6119a27b2b6552cd4c92 (patch) | |
tree | dc3e12713c8ebed73879da0f0f2dcf0905b89346 | |
parent | cc783950e43707ae2cae30d9bbe49985ca88b8fb (diff) | |
parent | 11beef0bc900391315860f9ac07d065382008519 (diff) | |
download | paste-045bd6b097722f43359c6119a27b2b6552cd4c92.tar.gz |
Merged in jeblair/paste (pull request #38)
Fix error on httpserver shutdown
-rwxr-xr-x | paste/httpserver.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/paste/httpserver.py b/paste/httpserver.py index 035d818..11489b0 100755 --- a/paste/httpserver.py +++ b/paste/httpserver.py @@ -734,7 +734,11 @@ class ThreadPool(object): raise RuntimeError( "Cannot kill worker; killthread/ctypes not available") thread_obj = threading._active.get(thread_id) - killthread.async_raise(thread_id, SystemExit) + try: + killthread.async_raise(thread_id, SystemExit) + except ValueError: + # invalid thread id -- the thread has died in the mean time + pass try: del self.worker_tracker[thread_id] except KeyError: |