diff options
| -rw-r--r-- | ipalib/constants.py | 3 | ||||
| -rw-r--r-- | ipalib/plugable.py | 2 | ||||
| -rw-r--r-- | ipalib/util.py | 3 | ||||
| -rwxr-xr-x | lite-xmlrpc.py | 36 |
4 files changed, 14 insertions, 30 deletions
diff --git a/ipalib/constants.py b/ipalib/constants.py index 7220561f7..f4a440c65 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -89,7 +89,8 @@ DEFAULT_CONFIG = ( ) -LOGGING_CONSOLE_FORMAT = ' '.join([ +LOGGING_CONSOLE_FORMAT = ': '.join([ + '%(name)s', '%(levelname)s', '%(message)s', ]) diff --git a/ipalib/plugable.py b/ipalib/plugable.py index dd74dc08e..b0ba32b7e 100644 --- a/ipalib/plugable.py +++ b/ipalib/plugable.py @@ -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): """ diff --git a/ipalib/util.py b/ipalib/util.py index 280910dc6..d577524b0 100644 --- a/ipalib/util.py +++ b/ipalib/util.py @@ -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) diff --git a/lite-xmlrpc.py b/lite-xmlrpc.py index b057138c8..5e2112d70 100755 --- a/lite-xmlrpc.py +++ b/lite-xmlrpc.py @@ -38,11 +38,6 @@ from ipalib.util import xmlrpc_unmarshal import traceback import krbV -api.load_plugins() - - -PORT=8888 - class StoppableXMLRPCServer(SimpleXMLRPCServer.SimpleXMLRPCServer): """Override of TIME_WAIT""" allow_reuse_address = True @@ -155,37 +150,26 @@ class LoggingSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHa if __name__ == '__main__': - # Set up our logger - logger = logging.getLogger('xmlrpcserver') - hdlr = logging.FileHandler('xmlrpcserver.log') - formatter = logging.Formatter("%(asctime)s %(levelname)s %(message)s") - hdlr.setFormatter(formatter) - logger.addHandler(hdlr) - logger.setLevel(logging.INFO) + api.bootstrap(context='server', verbose=True) + logger = api.logger # Set up the server - XMLRPCServer = StoppableXMLRPCServer(("",PORT), LoggingSimpleXMLRPCRequestHandler) - + XMLRPCServer = StoppableXMLRPCServer( + ('', api.env.lite_xmlrpc_port), + LoggingSimpleXMLRPCRequestHandler + ) XMLRPCServer.register_introspection_functions() - api.finalize() - - # Initialize our environment - config.set_default_env(api.env) - env_dict = config.read_config() - env_dict['server_context'] = True - api.env.update(env_dict) - # Get and register all the methods + api.finalize() for cmd in api.Command: - logger.info("registering %s" % cmd) + logger.debug('registering %s', cmd) XMLRPCServer.register_function(api.Command[cmd], cmd) - funcs = XMLRPCServer.funcs - print "Listening on port %d" % PORT + logger.info('Listening on port %d', api.env.lite_xmlrpc_port) try: XMLRPCServer.serve_forever() except KeyboardInterrupt: XMLRPCServer.server_close() - print "Server shutdown." + logger.info('Server shutdown.') |