summaryrefslogtreecommitdiff
path: root/kombu/transport/virtual/base.py
diff options
context:
space:
mode:
authorArcadiy Ivanov <arcadiy@ivanov.biz>2018-01-13 11:39:34 -0500
committerAsif Saifuddin Auvi <auvipy@users.noreply.github.com>2018-01-13 22:39:34 +0600
commit2f9eb53128b780628fb753d4851331c6aea19510 (patch)
tree3bf6055e4afe64046bde3cd01d5b53c8a904e9bb /kombu/transport/virtual/base.py
parente209fa6f84ca831cb2760a433dd172e6ce5cb6b6 (diff)
downloadkombu-2f9eb53128b780628fb753d4851331c6aea19510.tar.gz
Virtual transport timeout does not supesede period polling (#689)
fixes #688
Diffstat (limited to 'kombu/transport/virtual/base.py')
-rw-r--r--kombu/transport/virtual/base.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/kombu/transport/virtual/base.py b/kombu/transport/virtual/base.py
index 7f2c61ad..8ccb8f6c 100644
--- a/kombu/transport/virtual/base.py
+++ b/kombu/transport/virtual/base.py
@@ -956,6 +956,8 @@ class Transport(base.Transport):
time_start = monotonic()
get = self.cycle.get
polling_interval = self.polling_interval
+ if timeout and polling_interval and polling_interval > timeout:
+ polling_interval = timeout
while 1:
try:
get(self._deliver, timeout=timeout)