Use gear Text interface
This makes the transition to python3 much smoother. Change-Id: I9d8638dd98502bdd91cbe6caf3d94ce197f06c6f Depends-On: If6bfc35d916cfb84d630af59f4fde4ccae5187d4 Depends-On: I93bfe33f898294f30a82c0a24a18a081f9752354
This commit is contained in:
parent
ff97edb615
commit
e5c4afa94c
|
@ -11,7 +11,7 @@ python-daemon>=2.0.4,<2.1.0
|
||||||
extras
|
extras
|
||||||
statsd>=1.0.0,<3.0
|
statsd>=1.0.0,<3.0
|
||||||
voluptuous>=0.10.2
|
voluptuous>=0.10.2
|
||||||
gear>=0.5.7,<1.0.0
|
gear>=0.9.0,<1.0.0
|
||||||
apscheduler>=3.0
|
apscheduler>=3.0
|
||||||
PrettyTable>=0.6,<0.8
|
PrettyTable>=0.6,<0.8
|
||||||
babel>=1.0
|
babel>=1.0
|
||||||
|
|
|
@ -59,7 +59,7 @@ def boolify(x):
|
||||||
return bool(x)
|
return bool(x)
|
||||||
|
|
||||||
|
|
||||||
class LaunchGearWorker(gear.Worker):
|
class LaunchGearWorker(gear.TextWorker):
|
||||||
def __init__(self, *args, **kw):
|
def __init__(self, *args, **kw):
|
||||||
self.__launch_server = kw.pop('launch_server')
|
self.__launch_server = kw.pop('launch_server')
|
||||||
super(LaunchGearWorker, self).__init__(*args, **kw)
|
super(LaunchGearWorker, self).__init__(*args, **kw)
|
||||||
|
@ -71,7 +71,7 @@ class LaunchGearWorker(gear.Worker):
|
||||||
return super(LaunchGearWorker, self).handleNoop(packet)
|
return super(LaunchGearWorker, self).handleNoop(packet)
|
||||||
|
|
||||||
|
|
||||||
class NodeGearWorker(gear.Worker):
|
class NodeGearWorker(gear.TextWorker):
|
||||||
MASS_DO = 101
|
MASS_DO = 101
|
||||||
|
|
||||||
def sendMassDo(self, functions):
|
def sendMassDo(self, functions):
|
||||||
|
|
|
@ -308,7 +308,7 @@ class ExecutorClient(object):
|
||||||
self.sched.onBuildCompleted(build, 'SUCCESS')
|
self.sched.onBuildCompleted(build, 'SUCCESS')
|
||||||
return build
|
return build
|
||||||
|
|
||||||
gearman_job = gear.Job('executor:execute', json.dumps(params),
|
gearman_job = gear.TextJob('executor:execute', json.dumps(params),
|
||||||
unique=uuid)
|
unique=uuid)
|
||||||
build.__gearman_job = gearman_job
|
build.__gearman_job = gearman_job
|
||||||
build.__gearman_manager = None
|
build.__gearman_manager = None
|
||||||
|
@ -452,7 +452,7 @@ class ExecutorClient(object):
|
||||||
(build,))
|
(build,))
|
||||||
stop_uuid = str(uuid4().hex)
|
stop_uuid = str(uuid4().hex)
|
||||||
data = dict(uuid=build.__gearman_job.unique)
|
data = dict(uuid=build.__gearman_job.unique)
|
||||||
stop_job = gear.Job("executor:stop:%s" % build.__gearman_manager,
|
stop_job = gear.TextJob("executor:stop:%s" % build.__gearman_manager,
|
||||||
json.dumps(data), unique=stop_uuid)
|
json.dumps(data), unique=stop_uuid)
|
||||||
self.meta_jobs[stop_uuid] = stop_job
|
self.meta_jobs[stop_uuid] = stop_job
|
||||||
self.log.debug("Submitting stop job: %s", stop_job)
|
self.log.debug("Submitting stop job: %s", stop_job)
|
||||||
|
|
|
@ -335,7 +335,7 @@ class ExecutorServer(object):
|
||||||
port = self.config.get('gearman', 'port')
|
port = self.config.get('gearman', 'port')
|
||||||
else:
|
else:
|
||||||
port = 4730
|
port = 4730
|
||||||
self.worker = gear.Worker('Zuul Executor Server')
|
self.worker = gear.TextWorker('Zuul Executor Server')
|
||||||
self.worker.addServer(server, port)
|
self.worker.addServer(server, port)
|
||||||
self.log.debug("Waiting for server")
|
self.log.debug("Waiting for server")
|
||||||
self.worker.waitForServer()
|
self.worker.waitForServer()
|
||||||
|
|
|
@ -56,7 +56,7 @@ class MergeGearmanClient(gear.Client):
|
||||||
self.__merge_client.onBuildCompleted(job)
|
self.__merge_client.onBuildCompleted(job)
|
||||||
|
|
||||||
|
|
||||||
class MergeJob(gear.Job):
|
class MergeJob(gear.TextJob):
|
||||||
def __init__(self, *args, **kw):
|
def __init__(self, *args, **kw):
|
||||||
super(MergeJob, self).__init__(*args, **kw)
|
super(MergeJob, self).__init__(*args, **kw)
|
||||||
self.__event = threading.Event()
|
self.__event = threading.Event()
|
||||||
|
|
|
@ -54,7 +54,7 @@ class MergeServer(object):
|
||||||
port = self.config.get('gearman', 'port')
|
port = self.config.get('gearman', 'port')
|
||||||
else:
|
else:
|
||||||
port = 4730
|
port = 4730
|
||||||
self.worker = gear.Worker('Zuul Merger')
|
self.worker = gear.TextWorker('Zuul Merger')
|
||||||
self.worker.addServer(server, port)
|
self.worker.addServer(server, port)
|
||||||
self.log.debug("Waiting for server")
|
self.log.debug("Waiting for server")
|
||||||
self.worker.waitForServer()
|
self.worker.waitForServer()
|
||||||
|
|
|
@ -35,7 +35,7 @@ class RPCClient(object):
|
||||||
|
|
||||||
def submitJob(self, name, data):
|
def submitJob(self, name, data):
|
||||||
self.log.debug("Submitting job %s with data %s" % (name, data))
|
self.log.debug("Submitting job %s with data %s" % (name, data))
|
||||||
job = gear.Job(name,
|
job = gear.TextJob(name,
|
||||||
json.dumps(data),
|
json.dumps(data),
|
||||||
unique=str(time.time()))
|
unique=str(time.time()))
|
||||||
self.gearman.submitJob(job, timeout=300)
|
self.gearman.submitJob(job, timeout=300)
|
||||||
|
|
|
@ -38,7 +38,7 @@ class RPCListener(object):
|
||||||
port = self.config.get('gearman', 'port')
|
port = self.config.get('gearman', 'port')
|
||||||
else:
|
else:
|
||||||
port = 4730
|
port = 4730
|
||||||
self.worker = gear.Worker('Zuul RPC Listener')
|
self.worker = gear.TextWorker('Zuul RPC Listener')
|
||||||
self.worker.addServer(server, port)
|
self.worker.addServer(server, port)
|
||||||
self.worker.waitForServer()
|
self.worker.waitForServer()
|
||||||
self.register()
|
self.register()
|
||||||
|
|
Loading…
Reference in New Issue