summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-28 12:58:57 -1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-29 00:21:29 +0100
commit838a89141fd6a75da9f982ad2b035e823b692d2a (patch)
tree0c68634cfa17e7c0e950f2dac799f919e9ee5d6b
parentfda107a4a1033ac7111a3289dbe6e48cea986927 (diff)
downloadbitbake-838a89141fd6a75da9f982ad2b035e823b692d2a.tar.gz
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit fa85a8263971c25e67fa3b421c686a90e46acd87) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/server/process.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py
index 5a87f0820..b66fbe0ac 100644
--- a/lib/bb/server/process.py
+++ b/lib/bb/server/process.py
@@ -202,7 +202,7 @@ class ProcessServer(multiprocessing.Process):
# If we don't see a UI connection within maxuiwait, its unlikely we're going to see
# one. We have had issue with processes hanging indefinitely so timing out UI-less
# servers is useful.
- if not self.hadanyui and not self.timeout and (self.lastui + self.maxuiwait) < time.time():
+ if not self.hadanyui and not self.xmlrpc and not self.timeout and (self.lastui + self.maxuiwait) < time.time():
print("No UI connection within max timeout, exiting to avoid infinite loop.")
self.quit = True