From 8d87f7040fc25a52d6a2c4822b46799f5ab2c481 Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Fri, 6 Mar 2015 14:47:28 +0000 Subject: bitbake: xmlrpcserver: do not connect client on error We roll back the client connection if some error happens, like during setFeatures, as to leave the server accessible to other clients. (Bitbake rev: 4e4a2ee2f05f8741b2e09263e328420363975b02) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/lib/bb/server/xmlrpc.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'bitbake/lib/bb/server') diff --git a/bitbake/lib/bb/server/xmlrpc.py b/bitbake/lib/bb/server/xmlrpc.py index 4205a4c35f..afe3dfe5df 100644 --- a/bitbake/lib/bb/server/xmlrpc.py +++ b/bitbake/lib/bb/server/xmlrpc.py @@ -299,6 +299,8 @@ class BitBakeXMLRPCServerConnection(BitBakeBaseServerConnection): _, error = self.connection.runCommand(["setFeatures", self.featureset]) if error: + # disconnect the client, we can't make the setFeature work + self.connection.removeClient() # no need to log it here, the error shall be sent to the client raise BaseException(error) -- cgit v1.2.3-54-g00ecf