diff options
| author | Joe Arnold <joe@swiftstack.com> | 2012-11-07 15:57:12 -0800 |
|---|---|---|
| committer | Joe Arnold <joe@swiftstack.com> | 2012-11-07 15:57:12 -0800 |
| commit | 494979661be2cf1b89acc22a31cfd87b86bca44e (patch) | |
| tree | 1605dae8bb088277e6c12e9b8ece3d0fac708d20 | |
| parent | b83e27cba03e8cedd1dd98d7faff81ee35552532 (diff) | |
| download | swift-bench-494979661be2cf1b89acc22a31cfd87b86bca44e.tar.gz | |
Fixed swift-bench when using -b and a conf file
Change-Id: I72448cd8578b53a658f151354a26066772e4b9ec
| -rwxr-xr-x | bin/swift-bench | 1 | ||||
| -rw-r--r-- | swift/common/bench.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/swift-bench b/bin/swift-bench index b358ce7..b575b19 100755 --- a/bin/swift-bench +++ b/bin/swift-bench @@ -127,6 +127,7 @@ if __name__ == '__main__': sys.exit("No such conf file: %s" % conf) conf = readconf(conf, 'bench', log_name='swift-bench', defaults=CONF_DEFAULTS) + conf['bench_clients'] = [] else: conf = CONF_DEFAULTS parser.set_defaults(**conf) diff --git a/swift/common/bench.py b/swift/common/bench.py index 4a4b0a0..089bfa2 100644 --- a/swift/common/bench.py +++ b/swift/common/bench.py @@ -116,7 +116,7 @@ class BenchServer(object): level = logging.DEBUG if conf.log_level.lower() == 'debug' \ else logging.INFO logger.setLevel(level) - loghandler = logging.StreamHandler(stream=client_file) + loghandler = logging.StreamHandler(client_file) logformat = logging.Formatter( '%(server)s %(asctime)s %(levelname)s %(message)s') loghandler.setFormatter(logformat) |