From 5181361f7c81c8825dd90c0b6b35257e91f3e90d Mon Sep 17 00:00:00 2001
From: Victor Sergeyev <vsergeyev@mirantis.com>
Date: Fri, 29 May 2015 17:27:36 +0300
Subject: [PATCH] Fix condition in _publish_and_retry_on_missing_exchange()
The current condition logic in _publish_and_retry_on_missing_exchange()
replaces passed `timeout` value with `rpc_response_timeout` config value.
This patch fix it.
Change-Id: I451cd2b5da78a3d7011466dfb14669aa1dcf1d5c
---
oslo_messaging/_drivers/impl_rabbit.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py
index 8c696cb7e..83a30be99 100644
--- a/oslo_messaging/_drivers/impl_rabbit.py
+++ b/oslo_messaging/_drivers/impl_rabbit.py
@@ -1001,7 +1001,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)