From 801b0d29d435abe55df43da5036b4c8ff7bd59a6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 8 Aug 2017 20:55:21 +0100 Subject: bitbake: server/process: Ensure we don't loop on client EOFError The server currently crashes if we hit an EOFError due to controllersock still being in ready and the continue meaning ready isn't re-evaluated. Setting the value to False can mean the shutdown code doesn't handle the situation cleanly. Clear ready to avoid the crash/loop instead and handle any OSError whilst we're in here. (Bitbake rev: 2bc47e887c3b41417edaa89a8708c223fd2085de) Signed-off-by: Richard Purdie --- bitbake/lib/bb/server/process.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bitbake/lib/bb/server') diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index 338c44835e..ee8b14ea7d 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/lib/bb/server/process.py @@ -164,7 +164,7 @@ class ProcessServer(multiprocessing.Process): self.haveui = True - except EOFError: + except (EOFError, OSError): print("Disconnecting Client") fds.remove(self.controllersock) fds.remove(self.command_channel) @@ -190,7 +190,7 @@ class ProcessServer(multiprocessing.Process): command = self.command_channel.get() except EOFError: # Client connection shutting down - self.command_channel = False + ready = [] continue if command[0] == "terminateServer": self.quit = True -- cgit v1.2.3-54-g00ecf