Neater shutdown with twisted.

lib/python/Lifetime/__init__.py

@@ -31,6 +31,11 @@ def shutdown(exit_code,fast = 0):
         import ZServer
         ZServer.exit_code = exit_code
         _shutdown_phase = 1
+        try:
+            from twisted.internet import reactor
+            reactor.callLater(0.1, reactor.stop)
+        except ImportError:
+            pass
     if fast:
         # Someone wants us to shutdown fast. This is hooked into SIGTERM - so
         # possibly the system is going down and we can expect a SIGKILL within

lib/python/ZServer/HTTPResponse.py

@@ -313,6 +313,7 @@ class ChannelPipe:
 
     def start_response(self, status, headers, exc_info=None):
         # Used for WSGI
+        self._request.reply_code = int(status.split(' ')[0])
         status = 'HTTP/%s %s\r\n' % (self._request.version, status)
         self.write(status)
         headers = '\r\n'.join([': '.join(x) for x in headers])

lib/python/ZServer/PubCore/ZServerPublisher.py

@@ -33,5 +33,6 @@ class ZServerPublisher:
                     for r in res:
                         a['wsgi.output'].write(r)
                 finally:
+                    # TODO: Support keeping connections open.
                     a['wsgi.output']._close = 1
                     a['wsgi.output'].close()

lib/python/Zope2/Startup/__init__.py

@@ -115,12 +115,15 @@ class ZopeStarter:
         try:
             from App.config import getConfiguration
             config = getConfiguration()
+            import ZServer
             if config.twisted_servers:
                 if not _use_twisted:
                     raise ImportError("You do not have twisted installed.")
                 twisted.internet.reactor.run()
+                # Storing the exit code in the ZServer even for twisted, 
+                # but hey, it works...
+                sys.exit(ZServer.exit_code)
             else:
-                import ZServer
                 import Lifetime
                 Lifetime.loop()
                 sys.exit(ZServer.exit_code)