extras-buildsys/builder CONFIG.py,1.4,1.5 builder.py,1.5,1.6

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	CONFIG.py builder.py 
Log Message:
2005-07-06  Dan Williams <dcbw at redhat.com>

    * Convert M2Crypto code to pyOpenSSL so that stuff actually works




Index: CONFIG.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/CONFIG.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CONFIG.py	5 Jul 2005 21:07:52 -0000	1.4
+++ CONFIG.py	6 Jul 2005 21:20:49 -0000	1.5
@@ -18,7 +18,7 @@
 config_opts['distro_name'] = "fedora"
 config_opts['repo_name'] = "core"
 
-config_opts['ssl_buildserver'] = False
+config_opts['ssl_buildserver'] = True
 
 config_opts['fileserver_port'] = 8889
 config_opts['xmlrpc_port'] = 8888


Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- builder.py	5 Jul 2005 21:07:52 -0000	1.5
+++ builder.py	6 Jul 2005 21:20:49 -0000	1.6
@@ -34,7 +34,6 @@
 from plague import AuthedXMLRPCServer
 from plague import lighttpdManager
 from plague import HTTPServer
-from M2Crypto import threading as m2thread
 
 
 # Load in the config
@@ -608,8 +607,6 @@
         print "%s does not exist or is not readable." % work_dir
         os._exit(1)
 
-    m2thread.init()
-
     # Start up the HTTP server thread which the build server
     # pulls completed RPMs from
     port = config_opts['fileserver_port']
@@ -622,24 +619,23 @@
         http_server = lighttpdManager.lighttpdManager(http_cnf_file, g_our_hostname, port, work_dir, True, key_and_cert)
     else:
         if config_opts['ssl_buildserver']:
-            http_server = HTTPServer.HTTPServer(certs, (g_our_hostname, port), work_dir, certs)
+            http_server = HTTPServer.PlgHTTPServer(certs, (g_our_hostname, port), work_dir, certs)
         else:
-            http_server = HTTPServer.HTTPServer((g_our_hostname, port), work_dir, None)
+            http_server = HTTPServer.PlgHTTPServer((g_our_hostname, port), work_dir, None)
     http_server.start()
 
     # Stop running as root
     if drop_privs() == -1:
         http_server.stop()
         time.sleep(1)
-        m2thread.cleanup()
         os._exit(1)
 
     print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches))
     xmlrpc_port = config_opts['xmlrpc_port']
     if config_opts['ssl_buildserver']:
-        xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), certs)
+        xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((g_our_hostname, xmlrpc_port), None, certs)
     else:
-        xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port))
+        xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((g_our_hostname, xmlrpc_port), None)
     bcs = XMLRPCBuilderServer(localarches)
     xmlserver.register_instance(bcs)
 
@@ -650,13 +646,6 @@
         except KeyboardInterrupt, e:
             print "Shutting down..."
             break
-        except socket.error, e:
-            if e[0] == 11:      # Resource temporarily unavailable
-                try:
-                    time.sleep(0.1)
-                except KeyboardInterrupt, e:
-                    print "Shutting down..."
-                    break
 
         cur_time = time.time()
         if cur_time >= last_time + 3:
@@ -666,5 +655,4 @@
 
     http_server.stop()
     time.sleep(2)
-    m2thread.cleanup()
     os._exit(0)