From 6ff9c9e39de57964ad7f711a77243a7049e9cada Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Mon, 25 Nov 2013 15:21:27 -0600 Subject: bitbake: bitbake, xmlrpc.py: Implement memory resident auto port configuration/restart This patch adds the ability to dynamically select a port for the bitbake memory resident server when the BBSERVER port is set to -1. This allows for running multiple instances of the bitbake memory resident server on the same system in different build directories. The client portion of the bitbake instance can also request that the server automatically start when using the auto port feature. This is to deal with a bitbake instance that eventually times out and exits or that has died for some unknown reason. The new functionality allows for lazy startup of the server after sourcing the init script for the memory resident functionality. (Bitbake rev: d6abc07ff385357d312d8435b89e0a9c1f965433) Signed-off-by: Jason Wessel Signed-off-by: Richard Purdie --- bitbake/bin/bitbake | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'bitbake/bin/bitbake') diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index cca2b8d29b..a0a2baa4bc 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake @@ -302,6 +302,7 @@ def main(): # we start a stub server that is actually a XMLRPClient that connects to a real server server = servermodule.BitBakeXMLRPCClient(configParams.observe_only) server.saveConnectionDetails(configParams.remote_server) + server.saveConnectionConfigParams(configParams) if not configParams.server_only: # Collect the feature set for the UI @@ -312,11 +313,20 @@ def main(): server_connection = server.establishConnection(featureset) except: sys.exit(1) + if not server_connection: + sys.exit(1) server_connection.terminate() sys.exit(0) # Setup a connection to the server (cooker) server_connection = server.establishConnection(featureset) + if not server_connection: + if configParams.kill_server: + bb.fatal("Server already killed") + configParams.bind = configParams.remote_server + start_server(servermodule, configParams, configuration) + bb.event.ui_queue = [] + server_connection = server.establishConnection(featureset) # Restore the environment in case the UI needs it for k in cleanedvars: -- cgit v1.2.3-54-g00ecf