zuul/zuul
Code Issues Proposed changes

Support finger ports in finger URL

Browse Source 
We support configuring an alternate port for finger. Make sure it makes
its way into the URL we provide if it's provided.

Change-Id: I5f511e15c031755d5c90627830ed29b80c6285fd
This commit is contained in:
Monty Taylor
2017-06-11 10:57:27 -05:00
committed by David Shrewsbury
parent eea6bb9b7b
commit 0dbe15993a
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zuul/cmd/executor.py
View File

@@ -40,9 +40,6 @@ from zuul.lib.config import get_default
# Similar situation with gear and statsd.
DEFAULT_FINGER_PORT = 79
class Executor(zuul.cmd.ZuulApp):
def parse_arguments(self):
@@ -127,8 +124,10 @@ class Executor(zuul.cmd.ZuulApp):
self.setup_logging('executor', 'log_config')
self.log = logging.getLogger("zuul.Executor")
self.finger_port = int(get_default(self.config, 'executor',
'finger_port', DEFAULT_FINGER_PORT))
self.finger_port = int(
get_default(self.config, 'executor', 'finger_port',
zuul.executor.server.DEFAULT_FINGER_PORT)
)
self.start_log_streamer()
self.change_privs()
@@ -136,7 +135,8 @@ class Executor(zuul.cmd.ZuulApp):
ExecutorServer = zuul.executor.server.ExecutorServer
self.executor = ExecutorServer(self.config, self.connections,
jobdir_root=self.jobroot_dir,
keep_jobdir=self.args.keep_jobdir)
keep_jobdir=self.args.keep_jobdir,
log_streaming_port=self.finger_port)
self.executor.start()
signal.signal(signal.SIGUSR2, zuul.cmd.stack_dump_handler)