summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-01-05 15:45:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-06 15:27:35 +0000
commita178c5a16371d92b56da3968c2e4830188341fcf (patch)
treeb55a5f8f299dfa6cd5f8f17e0ed07dc0e3417409 /bitbake
parent773700dbc354425d599b223d72a0ccd2d034ce4a (diff)
downloadpoky-a178c5a16371d92b56da3968c2e4830188341fcf.tar.gz
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 <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/lib/bb/main.py13
1 files 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):
403 if not configParams.server_only: 403 if not configParams.server_only:
404 try: 404 try:
405 server_connection = server.establishConnection(featureset) 405 server_connection = server.establishConnection(featureset)
406 server_connection.setupEventQueue()
407 except Exception as e: 406 except Exception as e:
408 bb.fatal("Could not connect to server %s: %s" % (configParams.remote_server, str(e))) 407 bb.fatal("Could not connect to server %s: %s" % (configParams.remote_server, str(e)))
409 408
409 if configParams.kill_server:
410 server_connection.connection.terminateServer()
411 bb.event.ui_queue = []
412 return 0
413
414 server_connection.setupEventQueue()
415
410 # Restore the environment in case the UI needs it 416 # Restore the environment in case the UI needs it
411 for k in cleanedvars: 417 for k in cleanedvars:
412 os.environ[k] = cleanedvars[k] 418 os.environ[k] = cleanedvars[k]
@@ -418,11 +424,6 @@ def bitbake_main(configParams, configuration):
418 server_connection.terminate() 424 server_connection.terminate()
419 return 0 425 return 0
420 426
421 if configParams.kill_server:
422 server_connection.connection.terminateServer()
423 bb.event.ui_queue = []
424 return 0
425
426 try: 427 try:
427 return ui_module.main(server_connection.connection, server_connection.events, configParams) 428 return ui_module.main(server_connection.connection, server_connection.events, configParams)
428 finally: 429 finally: