summaryrefslogtreecommitdiffstats
path: root/nova/log.py
diff options
context:
space:
mode:
Diffstat (limited to 'nova/log.py')
-rw-r--r--nova/log.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/log.py b/nova/log.py
index 7970802f3..46a07b26c 100644
--- a/nova/log.py
+++ b/nova/log.py
@@ -361,7 +361,9 @@ def _setup_logging_from_flags():
nova_root.addHandler(streamlog)
elif not FLAGS.log_file:
- streamlog = logging.StreamHandler(stream=sys.stdout)
+ # pass sys.stdout as a positional argument
+ # python2.6 calls the argument strm, in 2.7 it's stream
+ streamlog = logging.StreamHandler(sys.stdout)
nova_root.addHandler(streamlog)
if FLAGS.publish_errors: