summaryrefslogtreecommitdiffstats
path: root/bin/nova-api
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-01-25 13:34:50 -0600
committerSandy Walsh <sandy.walsh@rackspace.com>2011-01-25 13:34:50 -0600
commita6052241ec7bce94b81e8d4fa1d43353e4eec51b (patch)
treead4a2dc6a1495bf546d2095ff9f975714ba81421 /bin/nova-api
parent5ff189808d45582f0799c14eaaec687a3cf8ad5e (diff)
parentb2d0a77c53d1bd108d233e58f68655381cec4e16 (diff)
downloadnova-a6052241ec7bce94b81e8d4fa1d43353e4eec51b.tar.gz
nova-a6052241ec7bce94b81e8d4fa1d43353e4eec51b.tar.xz
nova-a6052241ec7bce94b81e8d4fa1d43353e4eec51b.zip
merge with trunk
Diffstat (limited to 'bin/nova-api')
-rwxr-xr-xbin/nova-api5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/nova-api b/bin/nova-api
index 7b4fbeab1..11176a021 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -36,6 +36,7 @@ gettext.install('nova', unicode=1)
from nova import flags
from nova import log as logging
+from nova import version
from nova import wsgi
logging.basicConfig()
@@ -55,7 +56,7 @@ def run_app(paste_config_file):
if config is None:
LOG.debug(_("No paste configuration for app: %s"), api)
continue
- LOG.debug(_("App Config: %s\n%r"), api, config)
+ LOG.debug(_("App Config: %(api)s\n%(config)r") % locals())
wsgi.paste_config_to_flags(config, {
"verbose": FLAGS.verbose,
"%s_host" % api: config.get('host', '0.0.0.0'),
@@ -79,6 +80,8 @@ def run_app(paste_config_file):
if __name__ == '__main__':
FLAGS(sys.argv)
+ LOG.audit(_("Starting nova-api node (version %s)"),
+ version.version_string_with_vcs())
conf = wsgi.paste_config_file('nova-api.conf')
if conf:
run_app(conf)