x/gantt
Code Issues Proposed changes

Merge trunk.

Browse Source
This commit is contained in:
Todd Willey
2011-01-07 14:49:07 -05:00
parent f56f8ceb24 714c9c8e5c
commit b89f10c962
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nova/rpc.py
View File

@@ -192,6 +192,7 @@ class AdapterConsumer(TopicConsumer):
if msg_id: if msg_id:
msg_reply(msg_id, rval, None) msg_reply(msg_id, rval, None)
except Exception as e: except Exception as e:
logging.exception("Exception during message handling")
if msg_id: if msg_id:
msg_reply(msg_id, None, sys.exc_info()) msg_reply(msg_id, None, sys.exc_info())
return return

5
nova/service.py
View File

@@ -211,9 +211,10 @@ class Service(object):
try: try:
models.register_models() models.register_models()
except OperationalError: except OperationalError:
logging.exception(_("Data store is unreachable." logging.exception(_("Data store %s is unreachable."
" Trying again in %d seconds.") % " Trying again in %d seconds.") %
FLAGS.sql_retry_interval) (FLAGS.sql_connection,
FLAGS.sql_retry_interval))
time.sleep(FLAGS.sql_retry_interval) time.sleep(FLAGS.sql_retry_interval)