openstack
/
swift-bench
Code Issues Proposed changes

fixed missing NamedLogger import in bin/swift-bench, refactored 

LogAdapter.tnx_id so that it works with multiple calls to get_logger, fixed
common.middleware.catch_errors to only call get_logger if it needs too, renamed
x-cf-trans-id to x-swift-tnx-id
This commit is contained in:
Clay Gerrard 2011-01-04 16:00:01 -06:00
parent c9e41f98d4
commit 14e487d6da
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/swift-bench
View File

@ -22,7 +22,7 @@ import uuid
from optparse import OptionParser
from swift.common.bench import BenchController
from swift.common.utils import readconf, NamedLogger
from swift.common.utils import readconf, LogAdapter, NamedFormatter
# The defaults should be sufficient to run swift-bench on a SAIO
CONF_DEFAULTS = {
@ -124,10 +124,10 @@ if __name__ == '__main__':
'critical': logging.CRITICAL}.get(
options.log_level.lower(), logging.INFO))
loghandler = logging.StreamHandler()
logformat = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
loghandler.setFormatter(logformat)
logger.addHandler(loghandler)
logger = NamedLogger(logger, 'swift-bench')
logger = LogAdapter(logger)
logformat = NamedFormatter('swift-bench', logger, fmt='%(server)s %(asctime)s %(levelname)s %(message)s')
loghandler.setFormatter(logformat)
controller = BenchController(logger, options)
controller.run()