
This is a large refactor and as small as I could feasibly make it while keeping the tests working. I'll do the documentation and touch ups in the next commit to make digesting easier. Change-Id: Iac5083996a183d1d8a9b6cb8f70836f7c39ee910
116 lines
3.9 KiB
Python
116 lines
3.9 KiB
Python
# Copyright 2014 OpenStack Foundation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import json
|
|
import logging
|
|
import threading
|
|
import traceback
|
|
|
|
import gear
|
|
|
|
import merger
|
|
|
|
|
|
class MergeServer(object):
|
|
log = logging.getLogger("zuul.MergeServer")
|
|
|
|
def __init__(self, config, connections={}):
|
|
self.config = config
|
|
self.zuul_url = config.get('merger', 'zuul_url')
|
|
|
|
if self.config.has_option('merger', 'git_dir'):
|
|
merge_root = self.config.get('merger', 'git_dir')
|
|
else:
|
|
merge_root = '/var/lib/zuul/git'
|
|
|
|
if self.config.has_option('merger', 'git_user_email'):
|
|
merge_email = self.config.get('merger', 'git_user_email')
|
|
else:
|
|
merge_email = None
|
|
|
|
if self.config.has_option('merger', 'git_user_name'):
|
|
merge_name = self.config.get('merger', 'git_user_name')
|
|
else:
|
|
merge_name = None
|
|
|
|
self.merger = merger.Merger(merge_root, connections, merge_email,
|
|
merge_name)
|
|
|
|
def start(self):
|
|
self._running = True
|
|
server = self.config.get('gearman', 'server')
|
|
if self.config.has_option('gearman', 'port'):
|
|
port = self.config.get('gearman', 'port')
|
|
else:
|
|
port = 4730
|
|
self.worker = gear.Worker('Zuul Merger')
|
|
self.worker.addServer(server, port)
|
|
self.log.debug("Waiting for server")
|
|
self.worker.waitForServer()
|
|
self.log.debug("Registering")
|
|
self.register()
|
|
self.log.debug("Starting worker")
|
|
self.thread = threading.Thread(target=self.run)
|
|
self.thread.daemon = True
|
|
self.thread.start()
|
|
|
|
def register(self):
|
|
self.worker.registerFunction("merger:merge")
|
|
self.worker.registerFunction("merger:update")
|
|
|
|
def stop(self):
|
|
self.log.debug("Stopping")
|
|
self._running = False
|
|
self.worker.shutdown()
|
|
self.log.debug("Stopped")
|
|
|
|
def join(self):
|
|
self.thread.join()
|
|
|
|
def run(self):
|
|
self.log.debug("Starting merge listener")
|
|
while self._running:
|
|
try:
|
|
job = self.worker.getJob()
|
|
try:
|
|
if job.name == 'merger:merge':
|
|
self.log.debug("Got merge job: %s" % job.unique)
|
|
self.merge(job)
|
|
elif job.name == 'merger:update':
|
|
self.log.debug("Got update job: %s" % job.unique)
|
|
self.update(job)
|
|
else:
|
|
self.log.error("Unable to handle job %s" % job.name)
|
|
job.sendWorkFail()
|
|
except Exception:
|
|
self.log.exception("Exception while running job")
|
|
job.sendWorkException(traceback.format_exc())
|
|
except Exception:
|
|
self.log.exception("Exception while getting job")
|
|
|
|
def merge(self, job):
|
|
args = json.loads(job.arguments)
|
|
commit = self.merger.mergeChanges(args['items'])
|
|
result = dict(merged=(commit is not None),
|
|
commit=commit,
|
|
zuul_url=self.zuul_url)
|
|
job.sendWorkComplete(json.dumps(result))
|
|
|
|
def update(self, job):
|
|
args = json.loads(job.arguments)
|
|
self.merger.updateRepo(args['project'], args['url'])
|
|
result = dict(updated=True,
|
|
zuul_url=self.zuul_url)
|
|
job.sendWorkComplete(json.dumps(result))
|