summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-27 22:29:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-28 12:40:11 +0100
commit4cc76db0a08690cbc0d0fd8f429707b5ac645580 (patch)
tree37ceb5261bdcbda757330ce6c5aa1035145d7924 /bitbake
parent449e07c1979ebce582ccc51c01ffc3b36892c7b4 (diff)
downloadpoky-4cc76db0a08690cbc0d0fd8f429707b5ac645580.tar.gz
bitbake: server/process: Account for xmlrpc connections
UI control can happen via the xmlrpc connection. Account for this when timing out UI connections. This was causing issues for toaster on systems where it couldn't parse the metadata within the timeout. (Bitbake rev: fa85a8263971c25e67fa3b421c686a90e46acd87) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/server/process.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index 5a87f0820d..b66fbe0acd 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -202,7 +202,7 @@ class ProcessServer(multiprocessing.Process):
202 # If we don't see a UI connection within maxuiwait, its unlikely we're going to see 202 # If we don't see a UI connection within maxuiwait, its unlikely we're going to see
203 # one. We have had issue with processes hanging indefinitely so timing out UI-less 203 # one. We have had issue with processes hanging indefinitely so timing out UI-less
204 # servers is useful. 204 # servers is useful.
205 if not self.hadanyui and not self.timeout and (self.lastui + self.maxuiwait) < time.time(): 205 if not self.hadanyui and not self.xmlrpc and not self.timeout and (self.lastui + self.maxuiwait) < time.time():
206 print("No UI connection within max timeout, exiting to avoid infinite loop.") 206 print("No UI connection within max timeout, exiting to avoid infinite loop.")
207 self.quit = True 207 self.quit = True
208 208