From 115919f0c11e22df783348422e06ab95f5c943e1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 6 Nov 2018 11:36:27 +0000 Subject: server/process: Fix unclosed socket warnings upon server connection refused Extend the server error handling to avoid: Reconnecting to bitbake server... NOTE: Retrying server connection... (Traceback (most recent call last): File "/home/pokybuild/yocto-worker/nightly-oe-selftest/build/bitbake/lib/bb/main.py", line 464, in setup_bitbake server_connection = bb.server.process.connectProcessServer(sockname, featureset) File "/home/pokybuild/yocto-worker/nightly-oe-selftest/build/bitbake/lib/bb/server/process.py", line 457, in connectProcessServer sock.connect(os.path.basename(sockname)) ConnectionRefusedError: [Errno 111] Connection refused ) WARNING: /home/pokybuild/yocto-worker/nightly-oe-selftest/build/bitbake/lib/bb/main.py:481: ResourceWarning: unclosed logger.info("Retrying server connection... (%s)" % traceback.format_exc()) NOTE: Starting bitbake server... Signed-off-by: Richard Purdie --- lib/bb/server/process.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py index 828159ed7..2246d954c 100644 --- a/lib/bb/server/process.py +++ b/lib/bb/server/process.py @@ -452,15 +452,14 @@ def connectProcessServer(sockname, featureset): cwd = os.getcwd() try: - os.chdir(os.path.dirname(sockname)) - sock.connect(os.path.basename(sockname)) - finally: - os.chdir(cwd) - - readfd = writefd = readfd1 = writefd1 = readfd2 = writefd2 = None - eq = command_chan_recv = command_chan = None + try: + os.chdir(os.path.dirname(sockname)) + sock.connect(os.path.basename(sockname)) + finally: + os.chdir(cwd) - try: + readfd = writefd = readfd1 = writefd1 = readfd2 = writefd2 = None + eq = command_chan_recv = command_chan = None # Send an fd for the remote to write events to readfd, writefd = os.pipe() -- cgit 1.2.3-korg