particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove a couple of unnecessary extra classes

Browse source
This commit is contained in:
Mike Bonnet 2010-07-26 15:58:45 -04:00
parent 02a948ce9d
commit 91dbcf0b0b
1 changed files with 14 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

39
vm/kojivmd
View file

@ -228,7 +228,7 @@ class DaemonXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
else:
SimpleXMLRPCServer.SimpleXMLRPCServer.__init__(self, (addr, port), logRequests=False,
allow_none=True)
self.logger = logging.getLogger('koji.vm.' + self.__class__.__name__)
self.logger = logging.getLogger('koji.vm.DaemonXMLRPCServer')
self.socket.settimeout(5)
self.active = True
@ -273,21 +273,6 @@ class DaemonXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer):
return response
class TaskXMLRPCServer(DaemonXMLRPCServer):
def __init__(self, addr, port, task_handler):
DaemonXMLRPCServer.__init__(self, addr, port)
self.register_function(task_handler.getTaskInfo)
self.register_function(task_handler.closeTask)
self.register_function(task_handler.failTask)
self.register_function(task_handler.getLatestBuild)
self.register_function(task_handler.getFileList)
self.register_function(task_handler.getFile)
self.register_function(task_handler.verifyBuildReq)
self.register_function(task_handler.upload)
self.register_function(task_handler.verifyChecksum)
class WinBuildTask(BaseTaskHandler):
"""
Spawns a vmExec task to run a build, and imports the output.
@ -615,7 +600,16 @@ class VMExecTask(BaseTaskHandler):
Setup the task-specific xmlrpc server to listen to requests from
the VM.
"""
self.server = TaskXMLRPCServer(self.options.privaddr, self.port, self)
self.server = DaemonXMLRPCServer(self.options.privaddr, self.port)
self.server.register_function(self.getTaskInfo)
self.server.register_function(self.closeTask)
self.server.register_function(self.failTask)
self.server.register_function(self.getLatestBuild)
self.server.register_function(self.getFileList)
self.server.register_function(self.getFile)
self.server.register_function(self.verifyBuildReq)
self.server.register_function(self.upload)
self.server.register_function(self.verifyChecksum)
thr = threading.Thread(name='task_%s_thread' % self.id,
target=self.server.handle_while_active)
thr.setDaemon(True)
@ -690,13 +684,6 @@ class VMExecTask(BaseTaskHandler):
else:
raise koji.BuildError, self.output
class ManagerXMLRPCServer(DaemonXMLRPCServer):
def __init__(self, addr, port, manager):
DaemonXMLRPCServer.__init__(self, addr, port)
self.register_function(manager.registerVM)
self.register_function(manager.getPort)
class VMTaskManager(TaskManager):
def __init__(self, options, session):
super(VMTaskManager, self).__init__(options, session)
@ -740,7 +727,9 @@ class VMTaskManager(TaskManager):
self.macaddr_lock.release()
def setupServer(self):
self.server = ManagerXMLRPCServer(self.options.privaddr, self.options.portbase, self)
self.server = DaemonXMLRPCServer(self.options.privaddr, self.options.portbase)
self.server.register_function(self.registerVM)
self.server.register_function(self.getPort)
thr = threading.Thread(name='manager_thread', target=self.server.handle_while_active)
thr.setDaemon(True)
thr.start()