pld-builder.new: PLD_Builder/config.py, PLD_Builder/request_handler_server....

[glen]

Author: glen                         Date: Mon Aug 25 13:36:08 2008 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- move request_server port to config

---- Files affected:
pld-builder.new/PLD_Builder:
   config.py (1.36 -> 1.37) , request_handler_server.py (1.2 -> 1.3) 
pld-builder.new/config:
   builder.conf (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/config.py
diff -u pld-builder.new/PLD_Builder/config.py:1.36 pld-builder.new/PLD_Builder/config.py:1.37
--- pld-builder.new/PLD_Builder/config.py:1.36	Thu Jul 17 18:03:27 2008
+++ pld-builder.new/PLD_Builder/config.py	Mon Aug 25 15:36:03 2008
@@ -67,6 +67,7 @@
         self.max_keep_time = int(get("max_keep_time", 168))*60*60
         self.bot_email = get("bot_email", "")
         self.control_url = get("control_url")
+        self.request_handler_server_port = int(get("request_handler_server_port", 1234))
         self.admin_email = get("admin_email")
         self.builder_list = get("builder_list", "")
         self.gen_upinfo = get("gen_upinfo", "yes")
@@ -94,7 +95,6 @@
         self.rpmqa_filename = get("rpmqa_filename")
         self.job_slots = int(get("job_slots"))
         self.max_load = float(get("max_load"))
-        self.control_url = get("control_url")
         self.rpm_cache_dir = get("rpm_cache_dir", "/spools/ready")
         self.builder_user = get("builder_user", "builder")
         self.sudo_chroot_wrapper = get("sudo_chroot_wrapper", "")

================================================================
Index: pld-builder.new/PLD_Builder/request_handler_server.py
diff -u pld-builder.new/PLD_Builder/request_handler_server.py:1.2 pld-builder.new/PLD_Builder/request_handler_server.py:1.3
--- pld-builder.new/PLD_Builder/request_handler_server.py:1.2	Mon Aug 25 15:12:37 2008
+++ pld-builder.new/PLD_Builder/request_handler_server.py	Mon Aug 25 15:36:03 2008
@@ -1,13 +1,10 @@
 #!/usr/bin/python
 
-host = ""
-port = 1234
-
-
 import string
 import cgi
 import time
 import StringIO
+from config import config, init_conf
 
 from os import curdir, sep
 from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
@@ -52,8 +49,12 @@
 
 def main():
 	try:
+		init_conf()
+		host = ""
+		port = config.request_handler_server_port
+
 		server = HTTPServer((host, port), MyHandler)
-		print 'started httpserver...'
+		print 'started httpserver on :%d...' % port
 		server.serve_forever()
 	except KeyboardInterrupt:
 		print '^C received, shutting down server'

================================================================
Index: pld-builder.new/config/builder.conf
diff -u pld-builder.new/config/builder.conf:1.36 pld-builder.new/config/builder.conf:1.37
--- pld-builder.new/config/builder.conf:1.36	Thu Jul 17 18:03:27 2008
+++ pld-builder.new/config/builder.conf	Mon Aug 25 15:36:03 2008
@@ -27,6 +27,9 @@
 # Keep rpms in /spools/ready inside chroots for how long (in hours).
 max_keep_time = 168
 
+# TCP port number for request_handler_server.py
+request_handler_server_port = 1289
+
 # Send '*.uploadinfo' files along with built rpms (used by pld-ftp-admin), but
 # probably not usefull for small, 'personal' builders. [yes/no]
 gen_upinfo = yes
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/config.py?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/request_handler_server.py?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/config/builder.conf?r1=1.36&r2=1.37&f=u