From a178c5a16371d92b56da3968c2e4830188341fcf Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 5 Jan 2016 15:45:38 +0200 Subject: bitbake: main: kill server without queue setup Setup of event queue includes registering of UI handler. This operation can fail when cooker is busy. However, there is no need in registering UI handler for terminating the server. Moved the call of connection.terminateServer before setting up of the event queue. This should make terminating server to work more reliably as it doesn't depend on setting up the event queue and registering UI handler anymore. This should also help Toaster backend to restart bitbake server and observer without getting "Could not register UI event handler" errors. [YOCTO #8776] (Bitbake rev: 0c5a9349f797d05c282c2ada1893e187e05f0576) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- bitbake/lib/bb/main.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py index dd0439391e..c0ae38ab6d 100755 --- a/bitbake/lib/bb/main.py +++ b/bitbake/lib/bb/main.py @@ -403,10 +403,16 @@ def bitbake_main(configParams, configuration): if not configParams.server_only: try: server_connection = server.establishConnection(featureset) - server_connection.setupEventQueue() except Exception as e: bb.fatal("Could not connect to server %s: %s" % (configParams.remote_server, str(e))) + if configParams.kill_server: + server_connection.connection.terminateServer() + bb.event.ui_queue = [] + return 0 + + server_connection.setupEventQueue() + # Restore the environment in case the UI needs it for k in cleanedvars: os.environ[k] = cleanedvars[k] @@ -418,11 +424,6 @@ def bitbake_main(configParams, configuration): server_connection.terminate() return 0 - if configParams.kill_server: - server_connection.connection.terminateServer() - bb.event.ui_queue = [] - return 0 - try: return ui_module.main(server_connection.connection, server_connection.events, configParams) finally: -- cgit v1.2.3-54-g00ecf