summaryrefslogtreecommitdiffstats
path: root/lib/bb/server/xmlrpc.py
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2013-06-07 17:03:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-14 14:24:56 +0100
commite171a363913a86e56266f4c9d107110c7f5221e3 (patch)
tree47f297d520c0e0c55a811ea3c7791c84e8f342f0 /lib/bb/server/xmlrpc.py
parent074003a4e7530a72863b9c685fc5c31b0f08c039 (diff)
downloadbitbake-contrib-e171a363913a86e56266f4c9d107110c7f5221e3.tar.gz
xmlrpc: removes the event servers controller
XMLRPC API ran a XMLRPC server at port+2 in order to provide endpoints to register an event server in which to dump the events. This is no longer used, so we remove it. Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/server/xmlrpc.py')
-rw-r--r--lib/bb/server/xmlrpc.py59
1 files changed, 0 insertions, 59 deletions
diff --git a/lib/bb/server/xmlrpc.py b/lib/bb/server/xmlrpc.py
index 0b51ebd20..359d5adb6 100644
--- a/lib/bb/server/xmlrpc.py
+++ b/lib/bb/server/xmlrpc.py
@@ -272,59 +272,6 @@ class BitBakeUIEventServer(threading.Thread):
if evt:
self.connection.event.sendpickle(pickle.dumps(evt))
-class BitBakeXMLRPCEventServerController(SimpleXMLRPCServer, threading.Thread):
- def __init__(self, interface):
- SimpleXMLRPCServer.__init__(self, interface, logRequests=False, allow_none=True)
- threading.Thread.__init__(self)
- self.register_function(self.registerEventHandler, "registerEventHandler")
- self.register_function(self.unregisterEventHandler, "unregisterEventHandler")
- self.register_function(self.terminateServer, "terminateServer")
- #self.register_function(self.runCommand, "runCommand")
- self.quit = False
- self.clients = {}
- self.client_ui_ids = {}
- self.timeout = 1 # timeout for .handle_request()
-
- def registerEventHandler(self, host, port):
- """
- Register a remote UI Event Handler
- """
- connection = xmlrpclib.ServerProxy("http://%s:%d/" % (host, port), allow_none=True)
- client_hash = "%s:%d" % (host, port)
- if self.clients.has_key(client_hash):
- return None
- client_ui_server = BitBakeUIEventServer(connection)
- self.client_ui_ids[client_hash] = bb.event.register_UIHhandler(client_ui_server)
- client_ui_server.start()
- self.clients[client_hash] = client_ui_server
- return client_hash
-
- def unregisterEventHandler(self, client_hash):
- """
- Unregister a remote UI Event Handler
- """
- client_thread = self.clients[client_hash]
- if client_thread:
- bb.event.unregister_UIHhandler(self.clients_ui_ids[client_hash])
- client_thread.terminateServer()
- client_thread.join()
- return True
- else:
- return False
-
- def terminateServer(self):
- self.quit = True
-
- def runCommand(self, cmd):
- return None
-
- def run(self):
- self.serve_forever()
-
- def serve_forever(self):
- while not self.quit:
- self.handle_request()
- self.server_close()
class XMLRPCProxyServer(BaseImplServer):
""" not a real working server, but a stub for a proxy server connection
@@ -369,9 +316,6 @@ class XMLRPCServer(SimpleXMLRPCServer, BaseImplServer):
def serve_forever(self):
- # Create and run the event server controller in a separate thread
- self.event_controller_thread = BitBakeXMLRPCEventServerController((self.host, self.port + 2))
- self.event_controller_thread.start()
# Start the actual XMLRPC server
bb.cooker.server_main(self.cooker, self._serve_forever)
@@ -414,9 +358,6 @@ class XMLRPCServer(SimpleXMLRPCServer, BaseImplServer):
retval = function(self, data, True)
except:
pass
- # Terminate the event server
- self.event_controller_thread.terminateServer()
- self.event_controller_thread.join()
self.server_close()
return