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:
Clint Byrum 2017-05-10 21:32:15 -07:00
parent ff97edb615
commit e5c4afa94c
8 changed files with 14 additions and 14 deletions

View File

@ -11,7 +11,7 @@ python-daemon>=2.0.4,<2.1.0
extras
statsd>=1.0.0,<3.0
voluptuous>=0.10.2
gear>=0.5.7,<1.0.0
gear>=0.9.0,<1.0.0
apscheduler>=3.0
PrettyTable>=0.6,<0.8
babel>=1.0

View File

@ -59,7 +59,7 @@ def boolify(x):
return bool(x)
class LaunchGearWorker(gear.Worker):
class LaunchGearWorker(gear.TextWorker):
def __init__(self, *args, **kw):
self.__launch_server = kw.pop('launch_server')
super(LaunchGearWorker, self).__init__(*args, **kw)
@ -71,7 +71,7 @@ class LaunchGearWorker(gear.Worker):
return super(LaunchGearWorker, self).handleNoop(packet)
class NodeGearWorker(gear.Worker):
class NodeGearWorker(gear.TextWorker):
MASS_DO = 101
def sendMassDo(self, functions):

View File

@ -308,8 +308,8 @@ class ExecutorClient(object):
self.sched.onBuildCompleted(build, 'SUCCESS')
return build
gearman_job = gear.Job('executor:execute', json.dumps(params),
unique=uuid)
gearman_job = gear.TextJob('executor:execute', json.dumps(params),
unique=uuid)
build.__gearman_job = gearman_job
build.__gearman_manager = None
self.builds[uuid] = build
@ -452,8 +452,8 @@ class ExecutorClient(object):
(build,))
stop_uuid = str(uuid4().hex)
data = dict(uuid=build.__gearman_job.unique)
stop_job = gear.Job("executor:stop:%s" % build.__gearman_manager,
json.dumps(data), unique=stop_uuid)
stop_job = gear.TextJob("executor:stop:%s" % build.__gearman_manager,
json.dumps(data), unique=stop_uuid)
self.meta_jobs[stop_uuid] = stop_job
self.log.debug("Submitting stop job: %s", stop_job)
self.gearman.submitJob(stop_job, precedence=gear.PRECEDENCE_HIGH,

View File

@ -335,7 +335,7 @@ class ExecutorServer(object):
port = self.config.get('gearman', 'port')
else:
port = 4730
self.worker = gear.Worker('Zuul Executor Server')
self.worker = gear.TextWorker('Zuul Executor Server')
self.worker.addServer(server, port)
self.log.debug("Waiting for server")
self.worker.waitForServer()

View File

@ -56,7 +56,7 @@ class MergeGearmanClient(gear.Client):
self.__merge_client.onBuildCompleted(job)
class MergeJob(gear.Job):
class MergeJob(gear.TextJob):
def __init__(self, *args, **kw):
super(MergeJob, self).__init__(*args, **kw)
self.__event = threading.Event()

View File

@ -54,7 +54,7 @@ class MergeServer(object):
port = self.config.get('gearman', 'port')
else:
port = 4730
self.worker = gear.Worker('Zuul Merger')
self.worker = gear.TextWorker('Zuul Merger')
self.worker.addServer(server, port)
self.log.debug("Waiting for server")
self.worker.waitForServer()

View File

@ -35,9 +35,9 @@ class RPCClient(object):
def submitJob(self, name, data):
self.log.debug("Submitting job %s with data %s" % (name, data))
job = gear.Job(name,
json.dumps(data),
unique=str(time.time()))
job = gear.TextJob(name,
json.dumps(data),
unique=str(time.time()))
self.gearman.submitJob(job, timeout=300)
self.log.debug("Waiting for job completion")

View File

@ -38,7 +38,7 @@ class RPCListener(object):
port = self.config.get('gearman', 'port')
else:
port = 4730
self.worker = gear.Worker('Zuul RPC Listener')
self.worker = gear.TextWorker('Zuul RPC Listener')
self.worker.addServer(server, port)
self.worker.waitForServer()
self.register()