diff options
Diffstat (limited to 'lib/bb/server/process.py')
| -rw-r--r-- | lib/bb/server/process.py | 31 |
1 files 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") |