From abf8a8fbc35c8d45c2357701400477792e39f80e Mon Sep 17 00:00:00 2001 From: Diego Santa Cruz Date: Tue, 2 Feb 2016 13:05:50 +0100 Subject: bitbake: bitbake: prserv: SIGTERM handling hung process The current SIGTERM handler hungs the process instead of making it exit. The problem seems to be that the handler thread is not signaled to quit, so it stays there doing its work, as it is not a daemon thread. Setting the quit variable fixes this. While at it, to not use the SystemExit exception to terminate upon SIGTERM but instead left the quit flag do its job. This way the PID file is properly removed. [YOCTO #9035] (Bitbake rev: 655ec800d54da581229f12efb6f0baf54975fed4) Signed-off-by: Diego Santa Cruz Signed-off-by: Richard Purdie --- bitbake/lib/prserv/serv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py index 1303f12b45..94d2abc15d 100644 --- a/bitbake/lib/prserv/serv.py +++ b/bitbake/lib/prserv/serv.py @@ -103,7 +103,7 @@ class PRServer(SimpleXMLRPCServer): def sigterm_handler(self, signum, stack): if self.table: self.table.sync() - raise SystemExit + self.quit=True def process_request(self, request, client_address): self.requestqueue.put((request, client_address)) -- cgit v1.2.3-54-g00ecf