server/process: Fix missing log messages on server exception

PATCH New Richard Purdie 1 participant 1 message May 12, 2016

Share & tools

Richard Purdie

author

2016-05-12 23:22 UTC #0 lore raw

PATCH 1/1 server/process: Fix missing log messages on server exception

Currently if the server dies, its possible that log messages are never displayed which is particularly problematic if one of those messages is the exception and backtrace the server died with.

Rather than having the event queue exit as soon as the server disappears, we should pop events from the queue until its empty before exiting.

This patch tweaks that code so that even if the server is dead and we're going to exit, we return any events left in the pipe. This makes debugging certain failures much easier.

Signed-off-by Richard Purdie <[email protected]>

bitbake/lib/bb/server/process.py +4 -4

index 76011e9..982fcf7 100644
@@ -222,11 +222,10 @@ class ProcessEventQueue(multiprocessing.queues.Queue):
 
     def waitEvent(self, timeout):
         if self.exit:
-            sys.exit(1)
+            return self.getEvent()
         try:
             if not self.server.is_alive():
-                self.setexit()
-                return None
+                return self.getEvent()
             return self.get(True, timeout)
         except Empty:
             return None

@@ -235,9 +234,10 @@ class ProcessEventQueue(multiprocessing.queues.Queue):
         try:
             if not self.server.is_alive():
                 self.setexit()
-                return None
             return self.get(False)
         except Empty:
+            if self.exit:
+                sys.exit(1)
             return None