aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2018-08-21 09:04:16 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-21 23:05:57 +0100
commitfcc8e1ff53696f78dd64b4ee32f3c433b7a47df0 (patch)
treeb6403b1805816cbe47713201a8e3c9c346b59272
parenta53ffec4ed3d0f9221bca398e20e8f480fb2b325 (diff)
downloadbitbake-contrib-fcc8e1ff53696f78dd64b4ee32f3c433b7a47df0.tar.gz
daemonize: Flush stdio on exit
In spite of a comment suggesting otherwise, os._exit() does not flush buffered output from file descriptors before exiting the process like os.exit() does. This means that any un-flushed output is lost in the daemon process, in particular the traceback from any thrown exceptions, making debugging exceptions in the daemon quite difficult. The solution is to flush stdout and stderr before exiting. Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/daemonize.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/bb/daemonize.py b/lib/bb/daemonize.py
index 8300d1d0f..bf1679346 100644
--- a/lib/bb/daemonize.py
+++ b/lib/bb/daemonize.py
@@ -49,8 +49,8 @@ def createDaemon(function, logfile):
# exit() or _exit()?
# _exit is like exit(), but it doesn't call any functions registered
# with atexit (and on_exit) or any registered signal handlers. It also
- # closes any open file descriptors. Using exit() may cause all stdio
- # streams to be flushed twice and any temporary files may be unexpectedly
+ # closes any open file descriptors, but doesn't flush any buffered output.
+ # Using exit() may cause all any temporary files to be unexpectedly
# removed. It's therefore recommended that child branches of a fork()
# and the parent branch(es) of a daemon use _exit().
os._exit(0)
@@ -79,4 +79,9 @@ def createDaemon(function, logfile):
traceback.print_exc()
finally:
bb.event.print_ui_queue()
+ # os._exit() doesn't flush open files like os.exit() does. Manually flush
+ # stdout and stderr so that any logging output will be seen, particularly
+ # exception tracebacks.
+ sys.stdout.flush()
+ sys.stderr.flush()
os._exit(0)