diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-01-07 14:49:07 -0500 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-01-07 14:49:07 -0500 |
| commit | 149ea349592a9fa60057e290e7659aad65b6cf65 (patch) | |
| tree | 7ebd7318bdf4caa1058ea7088764534c2eaca8f0 | |
| parent | 8952629c576498c3b576a1f9085a8d1b850e8639 (diff) | |
| parent | cbd67da1ae2a24462767a5a2aad0861792652c09 (diff) | |
| download | nova-149ea349592a9fa60057e290e7659aad65b6cf65.tar.gz nova-149ea349592a9fa60057e290e7659aad65b6cf65.tar.xz nova-149ea349592a9fa60057e290e7659aad65b6cf65.zip | |
Merge trunk.
| -rw-r--r-- | nova/db/sqlalchemy/__init__.py | 5 | ||||
| -rw-r--r-- | nova/rpc.py | 1 | ||||
| -rw-r--r-- | nova/service.py | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/nova/db/sqlalchemy/__init__.py b/nova/db/sqlalchemy/__init__.py index a9616a137..501373942 100644 --- a/nova/db/sqlalchemy/__init__.py +++ b/nova/db/sqlalchemy/__init__.py @@ -40,5 +40,6 @@ for i in xrange(FLAGS.sql_max_retries): models.register_models() break except OperationalError: - LOG.exception(_("Data store is unreachable." - " Trying again in %d seconds."), FLAGS.sql_retry_interval) + LOG.exception(_("Data store %s is unreachable." + " Trying again in %d seconds."), + FLAGS.sql_connection, FLAGS.sql_retry_interval) diff --git a/nova/rpc.py b/nova/rpc.py index bdf2f74b3..49b11602b 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -192,6 +192,7 @@ class AdapterConsumer(TopicConsumer): if msg_id: msg_reply(msg_id, rval, None) except Exception as e: + logging.exception("Exception during message handling") if msg_id: msg_reply(msg_id, None, sys.exc_info()) return diff --git a/nova/service.py b/nova/service.py index 05503b52b..864a42469 100644 --- a/nova/service.py +++ b/nova/service.py @@ -211,9 +211,10 @@ class Service(object): try: models.register_models() except OperationalError: - logging.exception(_("Data store is unreachable." - " Trying again in %d seconds.") % - FLAGS.sql_retry_interval) + logging.exception(_("Data store %s is unreachable." + " Trying again in %d seconds.") % + (FLAGS.sql_connection, + FLAGS.sql_retry_interval)) time.sleep(FLAGS.sql_retry_interval) |