IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

ipa tool: Print the name of the server we are connecting to with -v

Browse Source 
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 efe5a96725

https://fedorahosted.org/freeipa/ticket/4135

Reviewed-By: Tomáš Babej <tbabej@redhat.com>
This commit is contained in:
Petr Viktorin 2014-02-05 09:24:22 +01:00
parent 7b5124416b
commit 894b70a164
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipalib/rpc.py
View File

@ -746,7 +746,7 @@ class RPCClient(Connectible):
else: else:
transport_class = LanguageAwareTransport transport_class = LanguageAwareTransport
kw['transport'] = transport_class(protocol=self.protocol) kw['transport'] = transport_class(protocol=self.protocol)
self.log.debug('trying %s' % url) self.log.info('trying %s' % url)
setattr(context, 'request_url', url) setattr(context, 'request_url', url)
serverproxy = self.server_proxy_class(url, **kw) serverproxy = self.server_proxy_class(url, **kw)
if len(urls) == 1: if len(urls) == 1:
@ -828,8 +828,8 @@ class RPCClient(Connectible):
'%s.forward(): %r not in api.Command' % (self.name, name) '%s.forward(): %r not in api.Command' % (self.name, name)
) )
server = getattr(context, 'request_url', None) server = getattr(context, 'request_url', None)
self.debug("Forwarding '%s' to %s server '%s'", self.log.info("Forwarding '%s' to %s server '%s'",
name, self.protocol, server) name, self.protocol, server)
command = getattr(self.conn, name) command = getattr(self.conn, name)
params = [args, kw] params = [args, kw]
try: try:

5
ipaserver/advise/base.py
View File

@ -22,6 +22,7 @@ from ipalib import api
from ipalib.errors import ValidationError from ipalib.errors import ValidationError
from ipapython import admintool from ipapython import admintool
from textwrap import wrap 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.bootstrap(in_server=False, context='advise')
api.finalize() 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 # With no argument, print the list out and exit
if not self.args: if not self.args: