diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-07 15:30:58 -0800 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-07 15:30:58 -0800 |
| commit | be54e37bbd79293ce41f8fa8dfe40022aebb6fff (patch) | |
| tree | 8a46ee357f8fec2647bc9839c63b2053db343758 | |
| parent | 8e0fd37ddfbe88df296cf45583f0b3e4fa4d7a75 (diff) | |
| parent | bb4e0c940f49564c740a1863d110106d9018e8d4 (diff) | |
| download | nova-be54e37bbd79293ce41f8fa8dfe40022aebb6fff.tar.gz nova-be54e37bbd79293ce41f8fa8dfe40022aebb6fff.tar.xz nova-be54e37bbd79293ce41f8fa8dfe40022aebb6fff.zip | |
Merged with trunk and fixed conflict. Sigh.
| -rwxr-xr-x | bin/nova-api | 7 | ||||
| -rw-r--r-- | etc/api-paste.ini (renamed from etc/nova-api.conf) | 0 | ||||
| -rw-r--r-- | nova/log.py | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/bin/nova-api b/bin/nova-api index c921ec45c..f48dbe5a5 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -45,6 +45,8 @@ from nova import wsgi LOG = logging.getLogger('nova.api') FLAGS = flags.FLAGS +flags.DEFINE_string('paste_config', "api-paste.ini", + 'File name for the paste.deploy config for nova-api') if __name__ == '__main__': @@ -57,9 +59,10 @@ if __name__ == '__main__': for flag in FLAGS: flag_get = FLAGS.get(flag, None) LOG.debug("%(flag)s : %(flag_get)s" % locals()) - conf = wsgi.paste_config_file('nova-api.conf') + conf = wsgi.paste_config_file(FLAGS.paste_config) if not conf: - LOG.error(_("No paste configuration found for: %s"), 'nova-api.conf') + LOG.error(_("No paste configuration found for: %s"), + FLAGS.paste_config) sys.exit(1) else: service = service.serve_wsgi(service.ApiService, conf) diff --git a/etc/nova-api.conf b/etc/api-paste.ini index 9f7e93d4c..9f7e93d4c 100644 --- a/etc/nova-api.conf +++ b/etc/api-paste.ini diff --git a/nova/log.py b/nova/log.py index 87a21ddb4..d194ab8f0 100644 --- a/nova/log.py +++ b/nova/log.py @@ -266,7 +266,10 @@ class NovaRootLogger(NovaLogger): def handle_exception(type, value, tb): - logging.root.critical(str(value), exc_info=(type, value, tb)) + extra = {} + if FLAGS.verbose: + extra['exc_info'] = (type, value, tb) + logging.root.critical(str(value), **extra) def reset(): |