extras-buildsys/server BuildJob.py, 1.14, 1.15 CONFIG.py, 1.13, 1.14 buildserver.py, 1.11, 1.12 client_manager.py, 1.26, 1.27

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11305/server

Modified Files:
	BuildJob.py CONFIG.py buildserver.py client_manager.py 
Log Message:
2005-07-01  Dan Williams <dcbw at redhat.com>

    * We now use lighttpd as the fileserver in both the server and the builder.  It's
        a lot more robust than the python implementation, but the python implementation
        code still exists and can be used.

    * The server key and certificate must now be in the same file.  You can 'cat' them
        together with 'cat key.pem cert.pem > key_and_cert.pem'

    * Initialize m2crypto threading in buildservery.py and builder.py

    * Change some config options for the builder that said 'client' to 'builder'

    * Add some testing code to SimpleHTTPSServer.py and FileDownloader.py




Index: BuildJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildJob.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BuildJob.py	29 Jun 2005 21:32:33 -0000	1.14
+++ BuildJob.py	1 Jul 2005 11:51:33 -0000	1.15
@@ -410,7 +410,7 @@
             # Only some stages need to sleep because we stay in
             # them for a while.
             if do_sleep:
-                time.sleep(3)
+                time.sleep(5)
 
     def _start_unspawned_builds(self):
         for arch in self.buildarches:


Index: CONFIG.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/CONFIG.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CONFIG.py	27 Jun 2005 02:33:27 -0000	1.13
+++ CONFIG.py	1 Jul 2005 11:51:33 -0000	1.14
@@ -23,8 +23,7 @@
 
 # SSL Cert and key bits
 # MUST be full path to cert
-config_opts['server_cert'] = SERVER_BASE_DIR + "/certs/server_cert.pem"
-config_opts['server_key'] = SERVER_BASE_DIR + "/certs/server_key.pem"
+config_opts['server_key_and_cert'] = SERVER_BASE_DIR + "/certs/server_key_and_cert.pem"
 
 # CA cert that signs build client certificates
 config_opts['ca_cert'] = SERVER_BASE_DIR + "/certs/ca_cert.pem"


Index: buildserver.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/buildserver.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- buildserver.py	28 Jun 2005 01:41:33 -0000	1.11
+++ buildserver.py	1 Jul 2005 11:51:33 -0000	1.12
@@ -18,9 +18,11 @@
 
 import sys
 import os
-from plague import SimpleHTTPSServer
 from plague import SimpleSSLXMLRPCServer
+from plague import lighttpdManager
+from plague import SimpleHTTPSServer
 import SimpleXMLRPCServer
+from M2Crypto import threading as m2thread
 
 sys.path.append('/usr/share/plague/server')
 
@@ -34,6 +36,8 @@
 # Load in the config
 execfile("/etc/plague/server/CONFIG.py")
 
+use_lighttpd = True
+
 
 class AuthenticatedSSLXMLRPCServer(SimpleSSLXMLRPCServer.SimpleSSLXMLRPCServer):
     """
@@ -86,6 +90,8 @@
 
     hostname = sys.argv[1]
 
+    m2thread.init()
+
     bcm = BuildClientManager()
 
     # Create the BuildMaster thread
@@ -93,15 +99,8 @@
     bm.start()
 
     # SSL certificate and key filenames
-    srpm_server_certs = {}
-    srpm_server_certs['cert'] = config_opts['server_cert']
-    srpm_server_certs['key'] = config_opts['server_key']
-    srpm_server_certs['ca_cert'] = config_opts['ca_cert']
-    srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert']
-
     ui_certs = {}
-    ui_certs['cert'] = config_opts['server_cert']
-    ui_certs['key'] = config_opts['server_key']
+    ui_certs['key_and_cert'] = config_opts['server_key_and_cert']
     ui_certs['ca_cert'] = config_opts['ca_cert']
     ui_certs['peer_ca_cert'] = config_opts['ui_ca_cert']
 
@@ -117,7 +116,15 @@
 
     # SRPM fileserver
     http_dir = os.path.join(config_opts['server_work_dir'], "srpm_http_dir")
-    srpm_server = SimpleHTTPSServer.SimpleHTTPSServer(srpm_server_certs, (hostname, 8886), http_dir)
+    if use_lighttpd:
+        http_cnf_file = "/var/tmp/plague-server.conf"
+        srpm_server = lighttpdManager.lighttpdManager(http_cnf_file, hostname, 8886, http_dir, config_opts['server_key_and_cert'])
+    else:
+        srpm_server_certs = {}
+        srpm_server_certs['key_and_cert'] = config_opts['server_key_and_cert']
+        srpm_server_certs['ca_cert'] = config_opts['ca_cert']
+        srpm_server_certs['peer_ca_cert'] = config_opts['ca_cert']
+        srpm_server = SimpleHTTPSServer.SimpleHTTPSServer(srpm_server_certs, (hostname, 8886), http_dir)
     srpm_server.start()
 
     print "Build Server accepting requests on %s:8887.\n" % hostname
@@ -127,9 +134,11 @@
         # Make sure the BuildMaster thread shuts down
         print "Shutting down..."
         bm.stop()
+        srpm_server.stop()
         del bm
 
     print "Done."
+    m2thread.cleanup()
     os._exit(0)
 
 


Index: client_manager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/client_manager.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- client_manager.py	29 Jun 2005 21:37:12 -0000	1.26
+++ client_manager.py	1 Jul 2005 11:51:33 -0000	1.27
@@ -34,8 +34,7 @@
 
 # SSL certificate and key filenames
 certs = {}
-certs['cert'] = config_opts['server_cert']
-certs['key'] = config_opts['server_key']
+certs['key_and_cert'] = config_opts['server_key_and_cert']
 certs['ca_cert'] = config_opts['ca_cert']
 certs['peer_ca_cert'] = config_opts['ca_cert']