mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
lite-xmlrpc.py now uses api.bootstrap() property, logs to api.logger
This commit is contained in:
@@ -89,7 +89,8 @@ DEFAULT_CONFIG = (
|
||||
)
|
||||
|
||||
|
||||
LOGGING_CONSOLE_FORMAT = ' '.join([
|
||||
LOGGING_CONSOLE_FORMAT = ': '.join([
|
||||
'%(name)s',
|
||||
'%(levelname)s',
|
||||
'%(message)s',
|
||||
])
|
||||
|
||||
@@ -744,7 +744,7 @@ class API(DictProxy):
|
||||
self.env.log,
|
||||
self.env.verbose,
|
||||
)
|
||||
object.__setattr__(self, 'log', 'logger')
|
||||
object.__setattr__(self, 'logger', logger)
|
||||
|
||||
def load_plugins(self):
|
||||
"""
|
||||
|
||||
@@ -114,10 +114,10 @@ def configure_logging(log_file, verbose):
|
||||
level -= 10
|
||||
|
||||
log = logging.getLogger('ipa')
|
||||
log.setLevel(level)
|
||||
|
||||
# Configure console handler
|
||||
console = logging.StreamHandler()
|
||||
console.setLevel(level)
|
||||
console.setFormatter(logging.Formatter(LOGGING_CONSOLE_FORMAT))
|
||||
log.addHandler(console)
|
||||
|
||||
@@ -130,7 +130,6 @@ def configure_logging(log_file, verbose):
|
||||
log.warn('Could not create log_dir %r', log_dir)
|
||||
return log
|
||||
file_handler = logging.FileHandler(log_file)
|
||||
file_handler.setLevel(level)
|
||||
file_handler.setFormatter(logging.Formatter(LOGGING_FILE_FORMAT))
|
||||
log.addHandler(file_handler)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user