From b3be4c3198e28571278404d31625a97f0c753831 Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Mon, 20 Oct 2008 15:10:35 -0400 Subject: Add listen_addr and listen_port to config so the address and port funcd listens on is configurable. overlord side code for this isnt done yet, so not all that useful at the moment. --- func/minion/server.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'func') diff --git a/func/minion/server.py b/func/minion/server.py index 64a8645..ccddece 100755 --- a/func/minion/server.py +++ b/func/minion/server.py @@ -152,7 +152,12 @@ def serve(): """ Code for starting the XMLRPC service. """ - server =FuncSSLXMLRPCServer(('', 51234)) + config = read_config("/etc/func/minion.conf", FuncdConfig) + listen_addr = config.listen_addr + listen_port = config.listen_port + if listen_port == '': + listen_port = 51234 + server =FuncSSLXMLRPCServer((listen_addr, listen_port)) server.logRequests = 0 # don't print stuff to console server.serve_forever() @@ -185,7 +190,7 @@ class FuncSSLXMLRPCServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer, self.acls = acls_mod.Acls(config=self.config) - AuthedXMLRPCServer.AuthedSSLXMLRPCServer.__init__(self, ("", 51234), + AuthedXMLRPCServer.AuthedSSLXMLRPCServer.__init__(self, args, self.key, self.cert, self.ca) -- cgit