From 5e4ca30281e6c82ac5d523e0e49e14bd6e4a56b2 Mon Sep 17 00:00:00 2001
From: Joe Arnold <joe@swiftstack.com>
Date: Wed, 7 Nov 2012 15:57:12 -0800
Subject: [PATCH] Fixed swift-bench when using -b and a conf file

Change-Id: I72448cd8578b53a658f151354a26066772e4b9ec
---
 bin/swift-bench       | 1 +
 swift/common/bench.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/swift-bench b/bin/swift-bench
index b358ce71b8..b575b1952c 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 4a4b0a0fe5..089bfa2994 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)