diff options
| author | Adrian Likins <alikins@redhat.com> | 2008-10-21 11:57:27 -0400 |
|---|---|---|
| committer | Adrian Likins <alikins@redhat.com> | 2008-10-21 11:57:27 -0400 |
| commit | c6137343761f3bf5e51bf3c732d768fc0f13e608 (patch) | |
| tree | 1dd3d0f0165d70a855fce770bde555c878641876 /func | |
| parent | e68618cbed9401e5773e4e5de3998e4cdad264be (diff) | |
| parent | b3be4c3198e28571278404d31625a97f0c753831 (diff) | |
| download | func-c6137343761f3bf5e51bf3c732d768fc0f13e608.tar.gz func-c6137343761f3bf5e51bf3c732d768fc0f13e608.tar.xz func-c6137343761f3bf5e51bf3c732d768fc0f13e608.zip | |
Merge branch 'master' of ssh://alikins@git.fedorahosted.org/git/func
Diffstat (limited to 'func')
| -rwxr-xr-x | func/minion/server.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/func/minion/server.py b/func/minion/server.py index 582921b..7a2db00 100755 --- a/func/minion/server.py +++ b/func/minion/server.py @@ -173,7 +173,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() @@ -206,7 +211,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) |