Fix Queue timeout occurring after successful reconnect

eyj · eyj · commit aa91a0ec95fe · 2016-01-11T17:04:55.000+01:00
diff --git a/beaver/run_queue.py b/beaver/run_queue.py
@@ -30,10 +30,6 @@ def run_queue(queue, beaver_config, logger=None):
                 logger.info('Transport connection issues, stopping queue')
                 break
 
-            if int(time.time()) - last_update_time > queue_timeout:
-                logger.info('Queue timeout of "{0}" seconds exceeded, stopping queue'.format(queue_timeout))
-                break
-
             command = None
             try:
                 if queue.full():
@@ -54,6 +50,10 @@ def run_queue(queue, beaver_config, logger=None):
                 else:
                     logger.debug('No data')
 
+            if int(time.time()) - last_update_time > queue_timeout:
+                logger.info('Queue timeout of "{0}" seconds exceeded, stopping queue'.format(queue_timeout))
+                break
+
             if command == 'callback':
                 if data.get('ignore_empty', False):
                     logger.debug('removing empty lines')
