diff options
| author | Allan Saddi <allan@saddi.com> | 2009-05-29 10:04:54 -0700 |
|---|---|---|
| committer | Allan Saddi <allan@saddi.com> | 2009-05-29 10:04:54 -0700 |
| commit | 8a1fd4cf1a5c17db0593eb05992542e04d4dfa65 (patch) | |
| tree | 7fe06af9f9f904538f9d311020d155f62a2e0e31 | |
| parent | 868db452f7f6095aa6466f6801b318ee2f5b6b0c (diff) | |
| download | flup-8a1fd4cf1a5c17db0593eb05992542e04d4dfa65.tar.gz | |
Call ThreadPool.shutdown() from threaded scgi server as well.
Make note of why it isn't called in ajp.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | flup/server/ajp.py | 4 | ||||
| -rw-r--r-- | flup/server/scgi.py | 1 |
3 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2009-05-29 Allan Saddi <allan@saddi.com> + + * Let all the active requests to finish before quitting. Thanks + to Anand Chitipothu for the patch! + 2009-05-26 Allan Saddi <allan@saddi.com> * Release 1.0.2 diff --git a/flup/server/ajp.py b/flup/server/ajp.py index 3dca295..ca26fca 100644 --- a/flup/server/ajp.py +++ b/flup/server/ajp.py @@ -156,6 +156,10 @@ class WSGIServer(BaseAJPServer, ThreadedServer): ret = ThreadedServer.run(self, sock) self._cleanupSocket(sock) + # AJP connections are more or less persistent. .shutdown() will + # not return until the web server lets go. So don't bother calling + # it... + #self.shutdown() self.logger.info('%s shutting down%s', self.__class__.__name__, self._hupReceived and ' (reload requested)' or '') diff --git a/flup/server/scgi.py b/flup/server/scgi.py index aad3d7b..e7071b6 100644 --- a/flup/server/scgi.py +++ b/flup/server/scgi.py @@ -151,6 +151,7 @@ class WSGIServer(BaseSCGIServer, ThreadedServer): ret = ThreadedServer.run(self, sock) self._cleanupSocket(sock) + self.shutdown() self.logger.info('%s shutting down%s', self.__class__.__name__, self._hupReceived and ' (reload requested)' or '') |