From: Robert Yang Date: Tue, 8 Aug 2017 09:12:08 +0000 (-0700) Subject: bitbake: main: Handle BB_SERVER_TIMEOUT = -1 for no server timeout X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=803b97a32effce3f0d1be11989406c7b63b86ac3;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git bitbake: main: Handle BB_SERVER_TIMEOUT = -1 for no server timeout Make BB_SERVER_TIMEOUT = -1 mean no unload forever. (Bitbake rev: 923d5567be6fd9969ca74c166f36817ec09305e3) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py index eba4aefb54b..0418d52b844 100755 --- a/bitbake/lib/bb/main.py +++ b/bitbake/lib/bb/main.py @@ -259,8 +259,10 @@ class BitBakeConfigParameters(cookerdata.ConfigParameters): help="The name/address for the bitbake xmlrpc server to bind to.") parser.add_option("-T", "--idle-timeout", type=float, dest="server_timeout", - default=os.environ.get("BB_SERVER_TIMEOUT", 0) or None, - help="Set timeout to unload bitbake server due to inactivity") + default=os.getenv("BB_SERVER_TIMEOUT"), + help="Set timeout to unload bitbake server due to inactivity, " + "set to -1 means no unload, " + "default: Environment variable BB_SERVER_TIMEOUT.") parser.add_option("", "--no-setscene", action="store_true", dest="nosetscene", default=False, diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index 5b8a549f94e..338c44835e1 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/lib/bb/server/process.py @@ -180,7 +180,8 @@ class ProcessServer(multiprocessing.Process): if self.timeout is None: print("No timeout, exiting.") self.quit = True - if not self.haveui and self.lastui and self.timeout and (self.lastui + self.timeout) < time.time(): + if not self.timeout == -1.0 and not self.haveui and self.lastui and self.timeout and \ + (self.lastui + self.timeout) < time.time(): print("Server timeout, exiting.") self.quit = True