From cc4cf23692279bb96925ee7188da03fe011adb0e Mon Sep 17 00:00:00 2001
From: Dana Powers <dana.powers@rd.io>
Date: Sun, 10 Jan 2016 15:43:33 -0800
Subject: Improve cluster.ttl() readability

---
 kafka/cluster.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/kafka/cluster.py b/kafka/cluster.py
index 84ad1d3..1cdc8dd 100644
--- a/kafka/cluster.py
+++ b/kafka/cluster.py
@@ -59,9 +59,13 @@ class ClusterMetadata(object):
         if self._need_update:
             ttl = 0
         else:
-            ttl = self._last_successful_refresh_ms + self.config['metadata_max_age_ms'] - now
-        retry = self._last_refresh_ms + self.config['retry_backoff_ms'] - now
-        return max(ttl, retry, 0)
+            metadata_age = now - self._last_successful_refresh_ms
+            ttl = self.config['metadata_max_age_ms'] - metadata_age
+
+        retry_age = now - self._last_refresh_ms
+        next_retry = self.config['retry_backoff_ms'] - retry_age
+
+        return max(ttl, next_retry, 0)
 
     def request_update(self):
         """
-- 
cgit v1.2.1