extras-buildsys/client CONFIG.py,1.4,1.5 buildclient.py,1.11,1.12

[Daniel Williams (dcbw)]

Author: dcbw

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

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

    * client/buildclient.py
      client/CONFIG.py
        - Fix up the XMLRPC server so its port is configurable, to support
            more than one build client running on the same machine




Index: CONFIG.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/CONFIG.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CONFIG.py	15 Jun 2005 05:01:31 -0000	1.4
+++ CONFIG.py	15 Jun 2005 05:15:55 -0000	1.5
@@ -5,6 +5,7 @@
 config_opts['distro_name'] = "fedora"
 config_opts['repo_name'] = "core"
 config_opts['fileserver_port'] = 8889
+config_opts['xmlrpc_port'] = 8888
 
 CLIENT_DIR = "/work/fedora-cvs/extras-buildsys/client"
 


Index: buildclient.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/client/buildclient.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- buildclient.py	15 Jun 2005 05:01:33 -0000	1.11
+++ buildclient.py	15 Jun 2005 05:15:55 -0000	1.12
@@ -357,15 +357,16 @@
 
     print "Binding to address '%s' with arches: [%s]" % (g_our_hostname, string.join(localarches))
 
-    xmlserver = SimpleSSLXMLRPCServer.SimpleSSLXMLRPCServer(certs, (g_our_hostname, 8888))
+    xmlrpc_port = CONFIG.get('xmlrpc_port')
+    xmlserver = SimpleSSLXMLRPCServer.SimpleSSLXMLRPCServer(certs, (g_our_hostname, xmlrpc_port))
     bcs = XMLRPCBuildClientServer(localarches)
     xmlserver.register_instance(bcs)
 
     # Start up the HTTP server thread which the build server
     # pulls completed RPMs from
     work_dir = CONFIG.get('client_work_dir')
-    port = CONFIG.get('fileserver_port')
-    http_server = SimpleHTTPSServer.SimpleHTTPSServer(certs, (g_our_hostname, port), work_dir)
+    fs_port = CONFIG.get('fileserver_port')
+    http_server = SimpleHTTPSServer.SimpleHTTPSServer(certs, (g_our_hostname, fs_port), work_dir)
     http_server.start()
 
     last_time = time.time()