From: Alexandru DAMIAN <[email protected]> We add support to specify a connection token in the command line and in the environment variable BBTOKEN.
When a client registers to a bitbake server, that client will have exclusive access to the server. The client is identified by a server-supplied token. If a client terminates, we cannot reconnect to the server as the token is lost. This patch adds the capability to specify the connection token in the command line for xmlrpc clients. This allows us to have bitbake work as an already-authenticated client with the server and resume sending commands to a server. Signed-off-by: Alexandru DAMIAN <[email protected]> --- bin/bitbake | 8 +++++++- lib/bb/server/xmlrpc.py | 19 ++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/bin/bitbake b/bin/bitbake index f120bac..b3acbe1 100755 --- a/bin/bitbake +++ b/bin/bitbake @@ -169,6 +169,9 @@ class BitBakeConfigParameters(cookerdata.ConfigParameters): parser.add_option("-t", "--servertype", help = "Choose which server to use, process or xmlrpc.", action = "store", dest = "servertype") + parser.add_option("", "--token", help = "Specify the connection token to be used when connecting to a remote server.", + action = "store", dest = "xmlrpctoken") + parser.add_option("", "--revisions-changed", help = "Set the exit code depending on whether upstream floating revisions have changed or not.", action = "store_true", dest = "revisions_changed", default = False) @@ -200,6 +203,9 @@ class BitBakeConfigParameters(cookerdata.ConfigParameters): options.servertype = "xmlrpc" options.remote_server = os.environ["BBSERVER"] + if "BBTOKEN" in os.environ: + options.xmlrpctoken = os.environ["BBTOKEN"] + # if BBSERVER says to autodetect, let's do that if options.remote_server: [host, port] = options.remote_server.split(":", 2) @@ -332,7 +338,7 @@ def main(): bb.event.ui_queue = [] else: # we start a stub server that is actually a XMLRPClient that connects to a real server - server = servermodule.BitBakeXMLRPCClient(configParams.observe_only) + server = servermodule.BitBakeXMLRPCClient(configParams.observe_only, configParams.xmlrpctoken) server.saveConnectionDetails(configParams.remote_server) diff --git a/lib/bb/server/xmlrpc.py b/lib/bb/server/xmlrpc.py index d6f4338..4205a4c 100644 --- a/lib/bb/server/xmlrpc.py +++ b/lib/bb/server/xmlrpc.py @@ -281,13 +281,16 @@ class BitBakeXMLRPCServerConnection(BitBakeBaseServerConnection): self.observer_only = observer_only self.featureset = featureset - def connect(self): - if not self.observer_only: - token = self.connection.addClient() - else: - token = "observer" + def connect(self, token = None): + if token is None: + if self.observer_only: + token = "observer" + else: + token = self.connection.addClient() + if token is None: return None + self.transport.set_connection_token(token) self.events = uievent.BBUIEventQueue(self.connection, self.clientinfo) @@ -336,7 +339,9 @@ class BitBakeServer(BitBakeBaseServer): class BitBakeXMLRPCClient(BitBakeBaseServer): - def __init__(self, observer_only = False): + def __init__(self, observer_only = False, token = None): + self.token = token + self.observer_only = observer_only # if we need extra caches, just tell the server to load them all pass @@ -366,7 +371,7 @@ class BitBakeXMLRPCClient(BitBakeBaseServer): try: self.serverImpl = XMLRPCProxyServer(host, port) self.connection = BitBakeXMLRPCServerConnection(self.serverImpl, (ip, 0), self.observer_only, featureset) - return self.connection.connect() + return self.connection.connect(self.token) except Exception as e: bb.warn("Could not connect to server at %s:%s (%s)" % (host, port, str(e))) raise e -- 1.9.1 -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
