LGTM, thanks
On Mon, Feb 10, 2014 at 12:22 PM, Klaus Aehlig <[email protected]> wrote: > As all RAPI requests now go to luxid, and masterd is going away, > remove option from RAPI client to chose a different socket. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > lib/rapi/baserlib.py | 14 ++------------ > 1 file changed, 2 insertions(+), 12 deletions(-) > > diff --git a/lib/rapi/baserlib.py b/lib/rapi/baserlib.py > index 51373a4..3575d45 100644 > --- a/lib/rapi/baserlib.py > +++ b/lib/rapi/baserlib.py > @@ -36,7 +36,6 @@ from ganeti import http > from ganeti import errors > from ganeti import compat > from ganeti import constants > -from ganeti import pathutils > from ganeti import utils > > > @@ -351,22 +350,13 @@ class ResourceBase(object): > """ > return bool(self._checkIntVariable("dry-run")) > > - def GetClient(self, query=True): > + def GetClient(self): > """Wrapper for L{luxi.Client} with HTTP-specific error handling. > > - @param query: this signifies that the client will only be used for > - queries; if the build-time parameter enable-split-queries is > - enabled, then the client will be connected to the query socket > - instead of the masterd socket > - > """ > - if query: > - address = pathutils.QUERY_SOCKET > - else: > - address = None > # Could be a function, pylint: disable=R0201 > try: > - return self._client_cls(address=address) > + return self._client_cls() > except rpcerr.NoMasterError, err: > raise http.HttpBadGateway("Can't connect to master daemon: %s" % > err) > except rpcerr.PermissionError: > -- > 1.9.0.rc1.175.g0b1dcb5 > > -- -- Helga Velroyen | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
