From 9cd1286da39cd9e8471b9b7644dc63ad6bfac429 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 15 Mar 2017 13:03:59 -0400 Subject: [PATCH] Clean up additional references to launcher Seems we missed these in our previous commit. Change-Id: I630d02e45f0a17cd6f5886fcf9a971a8264ebf10 Signed-off-by: Paul Belanger --- zuul/cmd/executor.py | 6 +++--- zuul/cmd/scheduler.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zuul/cmd/executor.py b/zuul/cmd/executor.py index 13d24b4be8..96ba4b3d52 100644 --- a/zuul/cmd/executor.py +++ b/zuul/cmd/executor.py @@ -79,9 +79,9 @@ class Executor(zuul.cmd.ZuulApp): self.log = logging.getLogger("zuul.Executor") - LaunchServer = zuul.executor.server.LaunchServer - self.executor = LaunchServer(self.config, self.connections, - keep_jobdir=self.args.keep_jobdir) + ExecutorServer = zuul.executor.server.ExecutorServer + self.executor = ExecutorServer(self.config, self.connections, + keep_jobdir=self.args.keep_jobdir) self.executor.start() signal.signal(signal.SIGUSR2, zuul.cmd.stack_dump_handler) diff --git a/zuul/cmd/scheduler.py b/zuul/cmd/scheduler.py index 889ad2b222..ff4e1f4a1f 100755 --- a/zuul/cmd/scheduler.py +++ b/zuul/cmd/scheduler.py @@ -141,7 +141,7 @@ class Scheduler(zuul.cmd.ZuulApp): self.sched = zuul.scheduler.Scheduler(self.config) - gearman = zuul.executor.client.LaunchClient(self.config, self.sched) + gearman = zuul.executor.client.ExecutorClient(self.config, self.sched) merger = zuul.merger.client.MergeClient(self.config, self.sched) nodepool = zuul.nodepool.Nodepool(self.sched)