Fix infinite loops in ressurrectionist / sniffer

Author: andrewvc

lib/logstash/outputs/elasticsearch/http_client/pool.rb

@@ -94,10 +94,16 @@ def urls
       url_info.keys
     end
 
-    def until_stopped(task_name)
+    def until_stopped(task_name, delay)
+      last_done = Time.now
       until @state_mutex.synchronize { @stopping }
         begin
-          yield
+          now = Time.now
+          if (now - last_done) >= delay
+            last_done = now
+            yield
+          end
+          sleep 1
         rescue => e
           logger.warn(
             "Error while performing #{task_name}",
@@ -111,7 +117,7 @@ def until_stopped(task_name)
 
     def start_sniffer
       @sniffer = Thread.new do
-        until_stopped("sniffing") { sniff! }
+        until_stopped("sniffing", sniffer_delay) { sniff! }
       end
     end
 
@@ -159,12 +165,8 @@ def sniffer_alive?
 
     def start_resurrectionist
       @resurrectionist = Thread.new do
-        last_resurrect = Time.now
-        until_stopped("resurrection") do
-          if Time.now-last_resurrect >= @resurrect_delay
-            last_resurrect = Time.now
-            resurrect_dead!
-          end
+        until_stopped("resurrection", @resurrect_delay) do
+          resurrect_dead!
         end
       end
     end