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 <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2017-08-08 20:55:21 +01:00
parent ea9fff4bd0
commit 801b0d29d4

View File

@@ -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