From: Sandro Tosi Date: Tue, 3 Jan 2012 21:47:28 +0000 (+0100) Subject: merge with 3.2 X-Git-Tag: v3.3.0a1~484^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b5626d52c6b8eed3fab84555fea18b44eecac72;p=thirdparty%2FPython%2Fcpython.git merge with 3.2 --- 9b5626d52c6b8eed3fab84555fea18b44eecac72 diff --cc Doc/library/socketserver.rst index 497e3eeac56f,34bcce0e4480..091af03faf0e --- a/Doc/library/socketserver.rst +++ b/Doc/library/socketserver.rst @@@ -153,26 -153,14 +153,26 @@@ Server Object .. method:: BaseServer.serve_forever(poll_interval=0.5) - Handle requests until an explicit :meth:`shutdown` request. Polls for - shutdown every *poll_interval* seconds. It also calls + Handle requests until an explicit :meth:`shutdown` request. - Poll for shutdown every *poll_interval* seconds. Ignores :attr:`self.timeout`. - If you need to do periodic tasks, do them in another thread. ++ Poll for shutdown every *poll_interval* seconds. Ignores :attr:`self.timeout`. It also calls + :meth:`service_actions` which may be used by a subclass or Mixin to provide + various cleanup actions. For e.g. ForkingMixin class uses + :meth:`service_actions` to cleanup the zombie child processes. + .. versionchanged:: 3.3 + Added service_actions call to the serve_forever method. + + +.. method:: BaseServer.service_actions() + + This is called by the serve_forever loop. This method is can be overridden + by Mixin's to add cleanup or service specific actions. + + .. versionadded:: 3.3 .. method:: BaseServer.shutdown() - Tells the :meth:`serve_forever` loop to stop and waits until it does. - Tell the :meth:`serve_forever` loop to stop and wait until it does. ++ Tell the :meth:`serve_forever` loop to stop and waits until it does. .. attribute:: BaseServer.address_family