[bitbake-devel] [PATCH 4/7] process: Move socket keep alive into BitBakeProcessServerConnection
Richard Purdie
richard.purdie at linuxfoundation.org
Fri Jul 28 14:55:26 UTC 2017
This cleans up the socket keep alive into better class structured code
and adds cleanup of the open file descriptors upon shutdown.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
lib/bb/server/process.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py
index 3d9077f..fb96804 100644
--- a/lib/bb/server/process.py
+++ b/lib/bb/server/process.py
@@ -336,12 +336,16 @@ class ServerCommunicator():
return
class BitBakeProcessServerConnection(object):
- def __init__(self, ui_channel, recv, eq):
+ def __init__(self, ui_channel, recv, eq, sock):
self.connection = ServerCommunicator(ui_channel, recv)
self.events = eq
+ # Save sock so it doesn't get gc'd for the life of our connection
+ self.socket_connection = sock
def terminate(self):
self.socket_connection.close()
+ self.connection.connection.close()
+ self.connection.recv.close()
return
class BitBakeServer(object):
@@ -413,12 +417,10 @@ def connectProcessServer(sockname, featureset):
sendfds(sock, [writefd, readfd1, writefd2])
- server_connection = BitBakeProcessServerConnection(command_chan, command_chan_recv, eq)
+ server_connection = BitBakeProcessServerConnection(command_chan, command_chan_recv, eq, sock)
server_connection.connection.updateFeatureSet(featureset)
- # Save sock so it doesn't get gc'd for the life of our connection
- server_connection.socket_connection = sock
except:
sock.close()
raise
--
2.7.4
More information about the bitbake-devel
mailing list