agent: handle redis TimeoutError

weka · Nov 20, 2019 · 77f8275 · 77f8275
1 parent b3c0cc7
commit 77f8275
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/talker_agent/talker.py b/talker_agent/talker.py
@@ -22,6 +22,7 @@
 from configparser import ConfigParser
 
 import redis
+from redis import TimeoutError
 
 
 def reraise(tp, value, tb=None):
@@ -534,7 +535,11 @@ def fetch_new_jobs(self):
         jobs_key = 'commands-%s' % self.host_id
         while not self.stop_fetching.is_set():
             new_jobs = []
-            ret = self.redis.blpop([jobs_key], timeout=1)
+            try:
+                ret = self.redis.blpop([jobs_key], timeout=1)
+            except TimeoutError as e:
+                logger.error(e, exc_info=True)
+                ret = None
             if not ret:
                 now = time.time()
                 self.scrub_seen_jobs(now=now)