Use scheduler-specific log config and pidfile
This makes the scheduler configuration style match the rest of the components. Change-Id: I87fc2d1f7138ead83142f4634f6a74663fb1a82a
This commit is contained in:
parent
01d733e95f
commit
d1de946403
|
@ -125,7 +125,6 @@ webapp
|
||||||
|
|
||||||
scheduler
|
scheduler
|
||||||
"""""""""
|
"""""""""
|
||||||
.. TODO: rename this to 'scheduler' (currently 'zuul') and update to match these docs
|
|
||||||
|
|
||||||
**tenant_config**
|
**tenant_config**
|
||||||
Path to tenant config file.
|
Path to tenant config file.
|
||||||
|
|
|
@ -1870,7 +1870,7 @@ class ZuulTestCase(BaseTestCase):
|
||||||
os.path.join(
|
os.path.join(
|
||||||
FIXTURE_DIR,
|
FIXTURE_DIR,
|
||||||
self.config.get('scheduler', 'tenant_config')))
|
self.config.get('scheduler', 'tenant_config')))
|
||||||
self.config.set('zuul', 'state_dir', self.state_root)
|
self.config.set('scheduler', 'state_dir', self.state_root)
|
||||||
self.config.set('merger', 'git_dir', self.merger_src_root)
|
self.config.set('merger', 'git_dir', self.merger_src_root)
|
||||||
self.config.set('merger', 'state_dir', self.merger_state_root)
|
self.config.set('merger', 'state_dir', self.merger_state_root)
|
||||||
self.config.set('executor', 'git_dir', self.executor_src_root)
|
self.config.set('executor', 'git_dir', self.executor_src_root)
|
||||||
|
|
|
@ -59,7 +59,7 @@ class Scheduler(zuul.cmd.ZuulApp):
|
||||||
signal.signal(signal.SIGHUP, signal.SIG_IGN)
|
signal.signal(signal.SIGHUP, signal.SIG_IGN)
|
||||||
self.log.debug("Reconfiguration triggered")
|
self.log.debug("Reconfiguration triggered")
|
||||||
self.read_config()
|
self.read_config()
|
||||||
self.setup_logging('zuul', 'log_config')
|
self.setup_logging('scheduler', 'log_config')
|
||||||
try:
|
try:
|
||||||
self.sched.reconfigure(self.config)
|
self.sched.reconfigure(self.config)
|
||||||
except Exception:
|
except Exception:
|
||||||
|
@ -140,7 +140,7 @@ class Scheduler(zuul.cmd.ZuulApp):
|
||||||
self.config.getboolean('gearman_server', 'start')):
|
self.config.getboolean('gearman_server', 'start')):
|
||||||
self.start_gear_server()
|
self.start_gear_server()
|
||||||
|
|
||||||
self.setup_logging('zuul', 'log_config')
|
self.setup_logging('scheduler', 'log_config')
|
||||||
self.log = logging.getLogger("zuul.Scheduler")
|
self.log = logging.getLogger("zuul.Scheduler")
|
||||||
|
|
||||||
self.sched = zuul.scheduler.Scheduler(self.config)
|
self.sched = zuul.scheduler.Scheduler(self.config)
|
||||||
|
@ -207,7 +207,7 @@ def main():
|
||||||
if scheduler.args.validate:
|
if scheduler.args.validate:
|
||||||
sys.exit(scheduler.test_config())
|
sys.exit(scheduler.test_config())
|
||||||
|
|
||||||
pid_fn = get_default(scheduler.config, 'zuul', 'pidfile',
|
pid_fn = get_default(scheduler.config, 'scheduler', 'pidfile',
|
||||||
'/var/run/zuul-scheduler/zuul-scheduler.pid',
|
'/var/run/zuul-scheduler/zuul-scheduler.pid',
|
||||||
expand_user=True)
|
expand_user=True)
|
||||||
pid = pid_file_module.TimeoutPIDLockFile(pid_fn, 10)
|
pid = pid_file_module.TimeoutPIDLockFile(pid_fn, 10)
|
||||||
|
|
|
@ -372,12 +372,12 @@ class Scheduler(threading.Thread):
|
||||||
self.log.debug("Waiting for exit")
|
self.log.debug("Waiting for exit")
|
||||||
|
|
||||||
def _get_queue_pickle_file(self):
|
def _get_queue_pickle_file(self):
|
||||||
state_dir = get_default(self.config, 'zuul', 'state_dir',
|
state_dir = get_default(self.config, 'scheduler', 'state_dir',
|
||||||
'/var/lib/zuul', expand_user=True)
|
'/var/lib/zuul', expand_user=True)
|
||||||
return os.path.join(state_dir, 'queue.pickle')
|
return os.path.join(state_dir, 'queue.pickle')
|
||||||
|
|
||||||
def _get_time_database_dir(self):
|
def _get_time_database_dir(self):
|
||||||
state_dir = get_default(self.config, 'zuul', 'state_dir',
|
state_dir = get_default(self.config, 'scheduler', 'state_dir',
|
||||||
'/var/lib/zuul', expand_user=True)
|
'/var/lib/zuul', expand_user=True)
|
||||||
d = os.path.join(state_dir, 'times')
|
d = os.path.join(state_dir, 'times')
|
||||||
if not os.path.exists(d):
|
if not os.path.exists(d):
|
||||||
|
@ -385,7 +385,7 @@ class Scheduler(threading.Thread):
|
||||||
return d
|
return d
|
||||||
|
|
||||||
def _get_project_key_dir(self):
|
def _get_project_key_dir(self):
|
||||||
state_dir = get_default(self.config, 'zuul', 'state_dir',
|
state_dir = get_default(self.config, 'scheduler', 'state_dir',
|
||||||
'/var/lib/zuul', expand_user=True)
|
'/var/lib/zuul', expand_user=True)
|
||||||
key_dir = os.path.join(state_dir, 'keys')
|
key_dir = os.path.join(state_dir, 'keys')
|
||||||
if not os.path.exists(key_dir):
|
if not os.path.exists(key_dir):
|
||||||
|
|
Loading…
Reference in New Issue