changeset 96:5bd897cada11

Call ThreadPool.shutdown() from threaded scgi server as well. Make note of why it isn't called in ajp.
author Allan Saddi <allan@saddi.com>
date Fri, 29 May 2009 10:04:54 -0700
parents 19ef4cdc1cd6
children 554d91b1ffe6
files ChangeLog flup/server/ajp.py flup/server/scgi.py
diffstat 3 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/ChangeLog	Fri May 29 19:49:45 2009 +0530
     1.2 +++ b/ChangeLog	Fri May 29 10:04:54 2009 -0700
     1.3 @@ -1,3 +1,8 @@
     1.4 +2009-05-29  Allan Saddi  <allan@saddi.com>
     1.5 +
     1.6 +	* Let all the active requests to finish before quitting. Thanks
     1.7 +	  to Anand Chitipothu for the patch!
     1.8 +
     1.9  2009-05-26  Allan Saddi  <allan@saddi.com>
    1.10  
    1.11  	* Release 1.0.2
     2.1 --- a/flup/server/ajp.py	Fri May 29 19:49:45 2009 +0530
     2.2 +++ b/flup/server/ajp.py	Fri May 29 10:04:54 2009 -0700
     2.3 @@ -156,6 +156,10 @@
     2.4          ret = ThreadedServer.run(self, sock)
     2.5  
     2.6          self._cleanupSocket(sock)
     2.7 +        # AJP connections are more or less persistent. .shutdown() will
     2.8 +        # not return until the web server lets go. So don't bother calling
     2.9 +        # it...
    2.10 +        #self.shutdown()
    2.11  
    2.12          self.logger.info('%s shutting down%s', self.__class__.__name__,
    2.13                           self._hupReceived and ' (reload requested)' or '')
     3.1 --- a/flup/server/scgi.py	Fri May 29 19:49:45 2009 +0530
     3.2 +++ b/flup/server/scgi.py	Fri May 29 10:04:54 2009 -0700
     3.3 @@ -151,6 +151,7 @@
     3.4          ret = ThreadedServer.run(self, sock)
     3.5  
     3.6          self._cleanupSocket(sock)
     3.7 +        self.shutdown()
     3.8  
     3.9          self.logger.info('%s shutting down%s', self.__class__.__name__,
    3.10                           self._hupReceived and ' (reload requested)' or '')