From 974281ed72d8366baa16ee85f7e93970689b5956 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 31 Jul 2017 08:09:03 +0100 Subject: process: Reorder server command processing and handle EOFError If the connection control socket and the command channel close together, we can race and hit EOFError exceptions before we close the channel. Reorder the code to handle this in the correct order and ignore the EOFError exceptions as they mean the client is disconnecting and shouldn't terminate the server. Signed-off-by: Richard Purdie --- lib/bb/server/process.py | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py index e4b9d9623..aefabbed0 100644 --- a/lib/bb/server/process.py +++ b/lib/bb/server/process.py @@ -133,19 +133,6 @@ class ProcessServer(multiprocessing.Process): if self.xmlrpc: fds.append(self.xmlrpc) while not self.quit: - if self.command_channel in ready: - command = self.command_channel.get() - if command[0] == "terminateServer": - self.quit = True - continue - try: - print("Running command %s" % command) - self.command_channel_reply.send(self.cooker.command.runCommand(command)) - except Exception as e: - logger.exception('Exception in server main event loop running command %s (%s)' % (command, str(e))) - - if self.xmlrpc in ready: - self.xmlrpc.handle_requests() if self.sock in ready: self.controllersock, address = self.sock.accept() if self.haveui: @@ -194,6 +181,24 @@ class ProcessServer(multiprocessing.Process): print("Server timeout, exiting.") self.quit = True + if self.command_channel in ready: + try: + command = self.command_channel.get() + except EOFError: + # Client connection shutting down + continue + if command[0] == "terminateServer": + self.quit = True + continue + try: + print("Running command %s" % command) + self.command_channel_reply.send(self.cooker.command.runCommand(command)) + except Exception as e: + logger.exception('Exception in server main event loop running command %s (%s)' % (command, str(e))) + + if self.xmlrpc in ready: + self.xmlrpc.handle_requests() + ready = self.idle_commands(.1, fds) print("Exiting") -- cgit 1.2.3-korg