summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Harris <rconradharris@gmail.com>2012-01-16 21:12:46 +0000
committerRick Harris <rconradharris@gmail.com>2012-01-16 21:12:46 +0000
commit067eb74733d00d2d9eda46b313c612746b1bba2e (patch)
treeee92a434a84a90d67ff00f30ace4a2db8701d06a
parentc897e40d6b3bb077c990aed481b99ec06a2286e2 (diff)
downloadnova-067eb74733d00d2d9eda46b313c612746b1bba2e.tar.gz
nova-067eb74733d00d2d9eda46b313c612746b1bba2e.tar.xz
nova-067eb74733d00d2d9eda46b313c612746b1bba2e.zip
Typofix for impl_kombu.
Fixes bug 917377 Change-Id: I375f70bc35fe96813f8706f1691d1619f46b8f84
-rw-r--r--nova/rpc/impl_kombu.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py
index 1b0d79e06..f6f0c0495 100644
--- a/nova/rpc/impl_kombu.py
+++ b/nova/rpc/impl_kombu.py
@@ -374,8 +374,8 @@ class Connection(object):
"""Handles reconnecting and re-establishing queues.
Will retry up to self.max_retries number of times.
self.max_retries = 0 means to retry forever.
- Sleep between tries, starting at self.rabbit_retry_interval
- seconds, backing off self.rabbit_retry_backoff number of seconds
+ Sleep between tries, starting at self.interval_start
+ seconds, backing off self.interval_stepping number of seconds
each attempt.
"""
@@ -412,9 +412,9 @@ class Connection(object):
sys.exit(1)
if attempt == 1:
- sleep_time = self.rabbit_retry_interval or 1
+ sleep_time = self.interval_start or 1
elif attempt > 1:
- sleep_time += self.rabbit_retry_backoff
+ sleep_time += self.interval_stepping
if self.interval_max:
sleep_time = min(sleep_time, self.interval_max)