diff options
| author | Cerberus <matt.dietz@rackspace.com> | 2011-02-28 11:39:23 -0600 |
|---|---|---|
| committer | Cerberus <matt.dietz@rackspace.com> | 2011-02-28 11:39:23 -0600 |
| commit | ca1af3d0c14537127cad2a1ef64c992210b506f0 (patch) | |
| tree | 35552ffffaead4e00a37f03375ad4116560954a9 /nova/rpc.py | |
| parent | 201391007e58b2f92fd7b56ccbf308e5909da7c0 (diff) | |
| parent | edf5da85648659b1a7ad105248d69ef9f8c977e4 (diff) | |
| download | nova-ca1af3d0c14537127cad2a1ef64c992210b506f0.tar.gz nova-ca1af3d0c14537127cad2a1ef64c992210b506f0.tar.xz nova-ca1af3d0c14537127cad2a1ef64c992210b506f0.zip | |
Merge from trunk and merge conflict resolution
Diffstat (limited to 'nova/rpc.py')
| -rw-r--r-- | nova/rpc.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nova/rpc.py b/nova/rpc.py index 8ae78b7e8..fbb90299b 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -91,18 +91,19 @@ class Consumer(messaging.Consumer): super(Consumer, self).__init__(*args, **kwargs) self.failed_connection = False break - except: # Catching all because carrot sucks + except Exception as e: # Catching all because carrot sucks fl_host = FLAGS.rabbit_host fl_port = FLAGS.rabbit_port fl_intv = FLAGS.rabbit_retry_interval - LOG.exception(_("AMQP server on %(fl_host)s:%(fl_port)d is" - " unreachable. Trying again in %(fl_intv)d seconds.") + LOG.error(_("AMQP server on %(fl_host)s:%(fl_port)d is" + " unreachable: %(e)s. Trying again in %(fl_intv)d" + " seconds.") % locals()) self.failed_connection = True if self.failed_connection: - LOG.exception(_("Unable to connect to AMQP server " - "after %d tries. Shutting down."), - FLAGS.rabbit_max_retries) + LOG.error(_("Unable to connect to AMQP server " + "after %d tries. Shutting down."), + FLAGS.rabbit_max_retries) sys.exit(1) def fetch(self, no_ack=None, auto_ack=None, enable_callbacks=False): |