summaryrefslogtreecommitdiffstats
path: root/nova/log.py
diff options
context:
space:
mode:
authorTodd Willey <todd@ansolabs.com>2011-01-13 18:23:18 -0500
committerTodd Willey <todd@ansolabs.com>2011-01-13 18:23:18 -0500
commit16a8f4a98973ae5e5541f2b43db4dc36eaed2647 (patch)
treeb7a3226c73d4b2bc4ab9473688138aa2e2cbdd7f /nova/log.py
parent73e49ac35cc8b0a97dd7cd9b39cf00cd15b1d9dd (diff)
parent24e6372891be1b6dd81de0af89ece88f256a32e9 (diff)
downloadnova-16a8f4a98973ae5e5541f2b43db4dc36eaed2647.tar.gz
nova-16a8f4a98973ae5e5541f2b43db4dc36eaed2647.tar.xz
nova-16a8f4a98973ae5e5541f2b43db4dc36eaed2647.zip
Merge trunk and fix how nova-combined works with paste.deploy.
Refactor some of the bits of nova-api into nova/wsgi for working with paste, for a little bit of de-duplication between nova-api and nova-combined. Makes a cleaner interface for how paste configs can set flags.
Diffstat (limited to 'nova/log.py')
-rw-r--r--nova/log.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/log.py b/nova/log.py
index c1428c051..4997d3f28 100644
--- a/nova/log.py
+++ b/nova/log.py
@@ -116,6 +116,8 @@ def basicConfig():
handler.setFormatter(_formatter)
if FLAGS.verbose:
logging.root.setLevel(logging.DEBUG)
+ else:
+ logging.root.setLevel(logging.INFO)
if FLAGS.use_syslog:
syslog = SysLogHandler(address='/dev/log')
syslog.setFormatter(_formatter)