From 894b70a164f06a865504e49cd4763670e4e1f8f6 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 5 Feb 2014 09:24:22 +0100 Subject: ipa tool: Print the name of the server we are connecting to with -v MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The logging level for these messages was decreaed so that they do not show up in ipa-advise output. Reset the log level to INFO and configure ipa-advise to not display INFO messages from xmlclient by default. Partially reverts commit efe5a96725d3ddcd05b03a1ca9df5597eee693be https://fedorahosted.org/freeipa/ticket/4135 Reviewed-By: Tomáš Babej --- ipalib/rpc.py | 6 +++--- ipaserver/advise/base.py | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ipalib/rpc.py b/ipalib/rpc.py index 3d6cc3f2c..2b47d1c0e 100644 --- a/ipalib/rpc.py +++ b/ipalib/rpc.py @@ -746,7 +746,7 @@ class RPCClient(Connectible): else: transport_class = LanguageAwareTransport kw['transport'] = transport_class(protocol=self.protocol) - self.log.debug('trying %s' % url) + self.log.info('trying %s' % url) setattr(context, 'request_url', url) serverproxy = self.server_proxy_class(url, **kw) if len(urls) == 1: @@ -828,8 +828,8 @@ class RPCClient(Connectible): '%s.forward(): %r not in api.Command' % (self.name, name) ) server = getattr(context, 'request_url', None) - self.debug("Forwarding '%s' to %s server '%s'", - name, self.protocol, server) + self.log.info("Forwarding '%s' to %s server '%s'", + name, self.protocol, server) command = getattr(self.conn, name) params = [args, kw] try: diff --git a/ipaserver/advise/base.py b/ipaserver/advise/base.py index abaf708dc..3f57f357e 100644 --- a/ipaserver/advise/base.py +++ b/ipaserver/advise/base.py @@ -22,6 +22,7 @@ from ipalib import api from ipalib.errors import ValidationError from ipapython import admintool from textwrap import wrap +from ipapython.ipa_log_manager import log_mgr """ @@ -173,6 +174,10 @@ class IpaAdvise(admintool.AdminTool): api.bootstrap(in_server=False, context='advise') api.finalize() + if not self.options.verbose: + # Do not print connection information by default + logger_name = r'ipa\.ipalib\.plugins\.rpcclient' + log_mgr.configure(dict(logger_regexps=[(logger_name, 'warning')])) # With no argument, print the list out and exit if not self.args: -- cgit