logging refactor to support proxy access logs
New log level "notice" set to python log level 25 maps to syslog priority LOG_NOTICE. Used for some messages in the proxy server, but will be available to all apps using the LogAdapter returned from get_logger. Cleaned up some code in get_logger so that console logging works with log_routes and removed some unneeded bits. NamedFormatter functionality was split between LogAdapter (which now inherits from logging.LoggerAdapter) and TxnFormatter (which now is only responsible for adding the log records txn_id). The proxy server app now configures a separate logger for access line logging. By default it will use the same settings as the regular proxy logger.
This commit is contained in:
parent
1032c62623
commit
a2c9757ece
|
@ -22,7 +22,7 @@ import uuid
|
||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
|
|
||||||
from swift.common.bench import BenchController
|
from swift.common.bench import BenchController
|
||||||
from swift.common.utils import readconf, LogAdapter, NamedFormatter
|
from swift.common.utils import readconf, LogAdapter
|
||||||
|
|
||||||
# The defaults should be sufficient to run swift-bench on a SAIO
|
# The defaults should be sufficient to run swift-bench on a SAIO
|
||||||
CONF_DEFAULTS = {
|
CONF_DEFAULTS = {
|
||||||
|
@ -125,9 +125,9 @@ if __name__ == '__main__':
|
||||||
options.log_level.lower(), logging.INFO))
|
options.log_level.lower(), logging.INFO))
|
||||||
loghandler = logging.StreamHandler()
|
loghandler = logging.StreamHandler()
|
||||||
logger.addHandler(loghandler)
|
logger.addHandler(loghandler)
|
||||||
logger = LogAdapter(logger)
|
logger = LogAdapter(logger, 'swift-bench')
|
||||||
logformat = NamedFormatter('swift-bench', logger,
|
logformat = logging.Formatter('%(server)s %(asctime)s %(levelname)s '
|
||||||
fmt='%(server)s %(asctime)s %(levelname)s %(message)s')
|
'%(message)s')
|
||||||
loghandler.setFormatter(logformat)
|
loghandler.setFormatter(logformat)
|
||||||
|
|
||||||
controller = BenchController(logger, options)
|
controller = BenchController(logger, options)
|
||||||
|
|
Loading…
Reference in New Issue