diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-29 22:55:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-29 22:55:32 +0000 |
| commit | ec5a789f22d82e8252b462daa4f475cfde8d8fe9 (patch) | |
| tree | 078fea222d980c674d05779b289bc11c08146b29 | |
| parent | c1c0af206944ee283509fbf49a932ff623d78a0c (diff) | |
| parent | 5181361f7c81c8825dd90c0b6b35257e91f3e90d (diff) | |
| download | oslo-messaging-ec5a789f22d82e8252b462daa4f475cfde8d8fe9.tar.gz | |
Merge "Fix condition in _publish_and_retry_on_missing_exchange()"
| -rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index 75041cd..60c84c5 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -1005,7 +1005,7 @@ class Connection(object): # TODO(sileht): use @retrying # NOTE(sileht): no need to wait the application expect a response # before timeout is exshauted - duration = (timeout if timeout is None + duration = (timeout if timeout is not None else self.conf.rpc_response_timeout) timer = rpc_common.DecayingTimer(duration=duration) |