diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-09-25 16:35:42 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-09-25 20:26:10 +0000 |
| commit | ac5067fb957556fbb2359e0bb8b99b6f733c6a04 (patch) | |
| tree | aafaae8c3984d6db1b4eeabd4c731b50d72b018f /openstack/common | |
| parent | adc2253fc9adffe9fe8f134432ec19c6c85588a7 (diff) | |
| download | oslo-ac5067fb957556fbb2359e0bb8b99b6f733c6a04.tar.gz oslo-ac5067fb957556fbb2359e0bb8b99b6f733c6a04.tar.xz oslo-ac5067fb957556fbb2359e0bb8b99b6f733c6a04.zip | |
LOG.exception() should only be used in exception handler
When used outside of an exception handler it will print the message
and then 'None', which isn't useful at all.
Change-Id: If687a764dea4c7dc0046d7c3054318f2a751a2ea
Diffstat (limited to 'openstack/common')
| -rw-r--r-- | openstack/common/rpc/impl_kombu.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py index 22dc031..34289bc 100644 --- a/openstack/common/rpc/impl_kombu.py +++ b/openstack/common/rpc/impl_kombu.py @@ -524,9 +524,9 @@ class Connection(object): log_info.update(params) if self.max_retries and attempt == self.max_retries: - LOG.exception(_('Unable to connect to AMQP server on ' - '%(hostname)s:%(port)d after %(max_retries)d ' - 'tries: %(err_str)s') % log_info) + LOG.error(_('Unable to connect to AMQP server on ' + '%(hostname)s:%(port)d after %(max_retries)d ' + 'tries: %(err_str)s') % log_info) # NOTE(comstud): Copied from original code. There's # really no better recourse because if this was a queue we # need to consume on, we have no way to consume anymore. @@ -540,9 +540,9 @@ class Connection(object): sleep_time = min(sleep_time, self.interval_max) log_info['sleep_time'] = sleep_time - LOG.exception(_('AMQP server on %(hostname)s:%(port)d is' - ' unreachable: %(err_str)s. Trying again in ' - '%(sleep_time)d seconds.') % log_info) + LOG.error(_('AMQP server on %(hostname)s:%(port)d is ' + 'unreachable: %(err_str)s. Trying again in ' + '%(sleep_time)d seconds.') % log_info) time.sleep(sleep_time) def ensure(self, error_callback, method, *args, **kwargs): @@ -550,7 +550,8 @@ class Connection(object): try: return method(*args, **kwargs) except (self.connection_errors, socket.timeout, IOError), e: - pass + if error_callback: + error_callback(e) except Exception, e: # NOTE(comstud): Unfortunately it's possible for amqplib # to return an error not covered by its transport @@ -560,8 +561,8 @@ class Connection(object): # and try to reconnect in this case. if 'timeout' not in str(e): raise - if error_callback: - error_callback(e) + if error_callback: + error_callback(e) self.reconnect() def get_channel(self): |