From f41e4e971e807157be68cf4496580494b8b60643 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 28 Jul 2017 15:42:50 +0100 Subject: process: Don't leak open pipes upon reconnection If we reconnect to the server, stop leaking pipes and clean up after ourselves. Signed-off-by: Richard Purdie --- lib/bb/server/process.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py index 6106c0738..3530bdc07 100644 --- a/lib/bb/server/process.py +++ b/lib/bb/server/process.py @@ -420,7 +420,11 @@ def connectProcessServer(sockname, featureset): finally: os.chdir(cwd) + readfd = writefd = readfd1 = writefd1 = readfd2 = writefd2 = None + eq = command_chan_recv = command_chan = None + try: + # Send an fd for the remote to write events to readfd, writefd = os.pipe() eq = BBUIEventQueue(readfd) @@ -435,9 +439,22 @@ def connectProcessServer(sockname, featureset): server_connection = BitBakeProcessServerConnection(command_chan, command_chan_recv, eq, sock) + # Close the ends of the pipes we won't use + for i in [writefd, readfd1, writefd2]: + os.close(i) + server_connection.connection.updateFeatureSet(featureset) - except: + except (Exception, SystemExit) as e: + if command_chan_recv: + command_chan_recv.close() + if command_chan: + command_chan.close() + for i in [writefd, readfd1, writefd2]: + try: + os.close(i) + except OSError: + pass sock.close() raise -- cgit 1.2.3-korg