From patchwork Fri Jan 13 08:30:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel, 6/9] bitbake: Add client socket info for BitBakeServerConnection Date: Fri, 13 Jan 2012 08:30:40 -0000 From: Dongxiao Xu X-Patchwork-Id: 19269 Message-Id: <375cfd69c1f87a1465f8e3ec2bea429f5fb9acc6.1326442655.git.dongxiao.xu@intel.com> To: bitbake-devel@lists.openembedded.org In server/client split model, the client will bind to a specific address and port. We need to pass the values to BitBakeServerConnection(). Signed-off-by: Dongxiao Xu --- lib/bb/server/xmlrpc.py | 4 ++-- lib/bb/ui/uievent.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/bb/server/xmlrpc.py b/lib/bb/server/xmlrpc.py index c53cee4..eff8009 100644 --- a/lib/bb/server/xmlrpc.py +++ b/lib/bb/server/xmlrpc.py @@ -247,9 +247,9 @@ class BitbakeServerInfo(): self.port = port class BitBakeServerConnection(): - def __init__(self, serverinfo): + def __init__(self, serverinfo, clientinfo=("localhost", 0)): self.connection = _create_server(serverinfo.host, serverinfo.port) - self.events = uievent.BBUIEventQueue(self.connection) + self.events = uievent.BBUIEventQueue(self.connection, clientinfo) for event in bb.event.ui_queue: self.events.queue_event(event) diff --git a/lib/bb/ui/uievent.py b/lib/bb/ui/uievent.py index 0e73817..28817a2 100644 --- a/lib/bb/ui/uievent.py +++ b/lib/bb/ui/uievent.py @@ -28,13 +28,14 @@ import socket, threading, pickle from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler class BBUIEventQueue: - def __init__(self, BBServer): + def __init__(self, BBServer, clientinfo=("localhost, 0")): self.eventQueue = [] self.eventQueueLock = threading.Lock() self.eventQueueNotify = threading.Event() self.BBServer = BBServer + self.clientinfo = clientinfo self.t = threading.Thread() self.t.setDaemon(True) @@ -72,7 +73,7 @@ class BBUIEventQueue: def startCallbackHandler(self): - server = UIXMLRPCServer() + server = UIXMLRPCServer(self.clientinfo) self.host, self.port = server.socket.getsockname() server.register_function( self.system_quit, "event.quit" ) @@ -98,7 +99,7 @@ class BBUIEventQueue: class UIXMLRPCServer (SimpleXMLRPCServer): - def __init__( self, interface = ("localhost", 0) ): + def __init__( self, interface ): self.quit = False SimpleXMLRPCServer.__init__( self, interface,