- move request_server port to config

Changed files:
    PLD_Builder/config.py -> 1.37
    PLD_Builder/request_handler_server.py -> 1.3
    config/builder.conf -> 1.37

diff --git a/PLD_Builder/config.py b/PLD_Builder/config.py
index 77074503f35dad8c4cb8e46c0996e51b4f7a4bf1..ace393e058d9dbd7ba7376a49ae92039971433d6 100644 (file)
--- a/PLD_Builder/config.py
+++ b/PLD_Builder/config.py
@@ -67,6 +67,7 @@ class Builder_Conf:
         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 @@ class Builder_Conf:
         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", "")

diff --git a/PLD_Builder/request_handler_server.py b/PLD_Builder/request_handler_server.py
index b429ef40ec91558cca74bf1813d935aa48e330b3..b60ee0fcbff256d6fd488b929adc4a3ee92430d0 100644 (file)
--- a/PLD_Builder/request_handler_server.py
+++ b/PLD_Builder/request_handler_server.py
@@ -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 @@ class MyHandler(BaseHTTPRequestHandler):
 
 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'

diff --git a/config/builder.conf b/config/builder.conf
index 7c9a37e80538d0a593e3fc2a4771c195d3223611..db5b59bcd09beeccf0277f9195d8005ea1db7ba2 100644 (file)
--- a/config/builder.conf
+++ b/config/builder.conf
@@ -27,6 +27,9 @@ sudo_chroot_wrapper =
 # 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