summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2014-02-05 09:24:22 +0100
committerPetr Viktorin <pviktori@redhat.com>2014-02-05 15:35:36 +0100
commit894b70a164f06a865504e49cd4763670e4e1f8f6 (patch)
treec898cc05709dce827204d774ba169c336e3fdafd
parent7b5124416b193ce026ff30f1968e00d8c800d881 (diff)
downloadfreeipa-894b70a164f06a865504e49cd4763670e4e1f8f6.zip
freeipa-894b70a164f06a865504e49cd4763670e4e1f8f6.tar.gz
freeipa-894b70a164f06a865504e49cd4763670e4e1f8f6.tar.xz
ipa tool: Print the name of the server we are connecting to with -v
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 <tbabej@redhat.com>
-rw-r--r--ipalib/rpc.py6
-rw-r--r--ipaserver/advise/base.py5
2 files changed, 8 insertions, 3 deletions
diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index 3d6cc3f..2b47d1c 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 abaf708..3f57f35 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: