extras-buildsys/common HTTPServer.py, 1.6.2.2, 1.6.2.3 SSLCommon.py, 1.10.4.2, 1.10.4.3
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Sun Mar 12 05:53:07 UTC 2006
Author: dcbw
Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17091/common
Modified Files:
Tag: STABLE_0_4
HTTPServer.py SSLCommon.py
Log Message:
2006-03-12 Dan Williams <dcbw at redhat.com>
* builder/builder.py
- Add a SIGTERM handler for clean shutdown
- Clean up lifecycle management
* common/HTTPServer.py
- Clean up lifecycle management of PlgHTTPServerManager objects
* common/SSLCommon.py
- Clean up lifecycle management of PlgBaseServer objects
- Initialize correct parent object in PlgBaseSSLServer.__init__
* etc/plague-builder.init
etc/plague-server.init
- Cleanups
* server/main.py
- Add a SIGTERM handler for clean shutdown
- Clean up lifecycle management
Index: HTTPServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -r1.6.2.2 -r1.6.2.3
--- HTTPServer.py 29 Nov 2005 06:36:38 -0000 1.6.2.2
+++ HTTPServer.py 12 Mar 2006 05:52:59 -0000 1.6.2.3
@@ -102,19 +102,17 @@
self._server = PlgHTTPSServer(addr, http_dir, certs)
else:
self._server = PlgHTTPServer(addr, http_dir)
- self._stop = False
self._stopped = False
threading.Thread.__init__(self)
self.setName("PlgHTTPServerManager: %s/%s" % (addr, http_dir))
def run(self):
DebugUtils.registerThreadName(self)
- while not self._stop:
- self._server.handle_request()
+ self._server.serve_forever()
self._stopped = True
def stop(self):
- self._stop = True
+ self._server.stop()
t = time.time()
while not self._stopped:
if time.time() > t + 2:
Index: SSLCommon.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v
retrieving revision 1.10.4.2
retrieving revision 1.10.4.3
diff -u -r1.10.4.2 -r1.10.4.3
--- SSLCommon.py 24 Nov 2005 22:32:02 -0000 1.10.4.2
+++ SSLCommon.py 12 Mar 2006 05:52:59 -0000 1.10.4.3
@@ -56,16 +56,17 @@
allow_reuse_address = 1
def __init__(self, server_addr, req_handler):
+ self._quit = False
self.allow_reuse_address = 1
SocketServer.ThreadingTCPServer.__init__(self, server_addr, req_handler)
+ def stop(self):
+ self._quit = True
+
def serve_forever(self):
- while True:
- try:
- self.handle_request()
- except KeyboardInterrupt, e:
- print "Shutting down..."
- break
+ while not self._quit:
+ self.handle_request()
+ self.server_close()
class PlgBaseSSLServer(PlgBaseServer):
@@ -75,7 +76,7 @@
self._timeout = timeout
self.ssl_ctx = CreateSSLContext(certs)
- SocketServer.BaseServer.__init__(self, server_address, req_handler)
+ PlgBaseServer.__init__(self, server_address, req_handler)
sock = socket.socket(self.address_family, self.socket_type)
con = SSL.Connection(self.ssl_ctx, sock)
More information about the scm-commits
mailing list