From c5d6ad5c6e971e6663d1ebeb2b558d8a731a9607 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Tue, 27 May 2008 16:39:47 -0400 Subject: Set default logging level to INFO (still logs to Apache) Add function entry log for the core IPA XML-RPC functions. --- ipa-server/xmlrpc-server/ipaxmlrpc.py | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) (limited to 'ipa-server/xmlrpc-server/ipaxmlrpc.py') diff --git a/ipa-server/xmlrpc-server/ipaxmlrpc.py b/ipa-server/xmlrpc-server/ipaxmlrpc.py index 4e2ad352..5e13611a 100644 --- a/ipa-server/xmlrpc-server/ipaxmlrpc.py +++ b/ipa-server/xmlrpc-server/ipaxmlrpc.py @@ -144,19 +144,26 @@ class ModXMLRPCRequestHandler(object): response = dumps(Fault(5, "Did not receive Kerberos credentials.")) return response + debuglevel = logging.INFO if pythonopts.get("IPADebug"): - opts['ipadebug'] = pythonopts.get("IPADebug") - - if opts['ipadebug'].lower() == "on": - logging.basicConfig(level=logging.DEBUG, - format='[%(asctime)s] [%(levelname)s] %(message)s', - datefmt='%a %b %d %H:%M:%S %Y', - stream=sys.stderr) - - for o in opts: - logging.debug("IPA: setting option %s: %s" % (o, opts[o])) -# for e in req.subprocess_env: -# logging.debug("IPA: environment %s: %s" % (e, req.subprocess_env[e])) + opts['ipadebug'] = pythonopts.get("IPADebug").lower() + + if opts['ipadebug'] == "on": + debuglevel = logging.DEBUG + + if not opts.get('ipadebug'): + opts['ipadebug'] = "off" + + logging.basicConfig(level=debuglevel, + format='[%(asctime)s] [%(levelname)s] %(message)s', + datefmt='%a %b %d %H:%M:%S %Y', + stream=sys.stderr) + +# if opts['ipadebug'] == "on": +# for o in opts: +# logging.debug("IPA: setting option %s: %s" % (o, opts[o])) +# for e in req.subprocess_env: +# logging.debug("IPA: environment %s: %s" % (e, req.subprocess_env[e])) # Tack onto the end of the passed-in arguments any options we also # need -- cgit