Restart TwitterStreamAgent::Worker every hour to prevent stalling

app/concerns/long_runnable.rb

@@ -51,7 +51,7 @@ module LongRunnable
   end
 
   class Worker
-    attr_reader :thread, :id, :agent, :config, :mutex
+    attr_reader :thread, :id, :agent, :config, :mutex, :scheduler
 
     def initialize(options = {})
       @id = options[:id]
@@ -92,6 +92,12 @@ module LongRunnable
       end
     end
 
+    def restart!
+      stop!
+      setup!(scheduler, mutex)
+      run!
+    end
+
     def every(*args, &blk)
       schedule(:every, args, &blk)
     end
@@ -100,6 +106,10 @@ module LongRunnable
       schedule(:cron, args, &blk)
     end
 
+    def schedule_in(*args, &blk)
+      schedule(:schedule_in, args, &blk)
+    end
+
     def boolify(value)
       agent.send(:boolify, value)
     end

app/models/agents/twitter_stream_agent.rb

@@ -150,13 +150,18 @@ module Agents
     end
 
     class Worker < LongRunnable::Worker
-      RELOAD_TIMEOUT = 10.minutes
+      RELOAD_TIMEOUT = 60.minutes
       DUPLICATE_DETECTION_LENGTH = 1000
       SEPARATOR = /[^\w_\-]+/
 
       def setup
         require 'twitter/json_stream'
         @filter_to_agent_map = @config[:filter_to_agent_map]
+
+        schedule_in RELOAD_TIMEOUT do
+          puts "--> Restarting TwitterStream #{id}"
+          restart!
+        end
       end
 
       def run
@@ -199,13 +204,13 @@ module Agents
 
         stream.on_no_data do |message|
           STDERR.puts " --> Got no data for awhile; trying to reconnect."
-          stop
+          restart!
         end
 
         stream.on_max_reconnects do |timeout, retries|
           STDERR.puts " --> Oops, tried too many times! <--"
           sleep 60
-          stop
+          restart!
         end
       end
 

lib/agent_runner.rb

@@ -16,7 +16,7 @@ class AgentRunner
     @mutex = Mutex.new
     @scheduler = Rufus::Scheduler.new(frequency: ENV['SCHEDULER_FREQUENCY'].presence || 0.3)
 
-    @scheduler.every 1 do
+    @scheduler.every 5 do
       restart_dead_workers if @running
     end
 

spec/concerns/long_runnable_spec.rb

@@ -40,7 +40,7 @@ describe LongRunnable do
   describe LongRunnable::Worker do
     before(:each) do
       @agent = Object.new
-      @worker = LongRunnable::Worker.new(agent: @agent)
+      @worker = LongRunnable::Worker.new(agent: @agent, id: 'test1234')
       @worker.setup!(Rufus::Scheduler.new, Mutex.new)
     end
 
@@ -84,5 +84,31 @@ describe LongRunnable do
         @worker.stop!
       end
     end
+
+    context "#restart!" do
+      it "stops, setups and starts the worker" do
+        mock(@worker).stop!
+        mock(@worker).setup!(@worker.scheduler, @worker.mutex)
+        mock(@worker).run!
+        @worker.restart!
+      end
+    end
+
+    context "scheduling" do
+      it "schedules tasks once" do
+        mock(@worker.scheduler).send(:schedule_in, 1.hour, tag: 'test1234')
+        @worker.schedule_in 1.hour do noop; end
+      end
+
+      it "schedules repeating tasks" do
+        mock(@worker.scheduler).send(:every, 1.hour, tag: 'test1234')
+        @worker.every 1.hour do noop; end
+      end
+
+      it "allows the cron syntax" do
+        mock(@worker.scheduler).send(:cron, '0 * * * *', tag: 'test1234')
+        @worker.cron '0 * * * *' do noop; end
+      end
+    end
   end
 end

spec/models/agents/twitter_stream_agent_spec.rb

@@ -169,7 +169,8 @@ describe Agents::TwitterStreamAgent do
       @config = {agent: @agent, config: {filter_to_agent_map: {'agent' => [@mock_agent]}}}
       @worker = Agents::TwitterStreamAgent::Worker.new(@config)
       @worker.instance_variable_set(:@recent_tweets, [])
-      @worker.setup
+      mock(@worker).schedule_in(Agents::TwitterStreamAgent::Worker::RELOAD_TIMEOUT)
+      @worker.setup!(nil, Mutex.new)
     end
 
     context "#run" do
@@ -226,7 +227,7 @@ describe Agents::TwitterStreamAgent do
 
         it "stop when no data was received"do
           stub_without(:on_no_data).on_no_data.yields
-          mock(@worker).stop
+          mock(@worker).restart!
           mock(STDERR).puts(" --> Got no data for awhile; trying to reconnect.")
           @worker.send(:stream!, ['agent'], @agent)
         end
@@ -235,7 +236,7 @@ describe Agents::TwitterStreamAgent do
           stub_without(:on_max_reconnects).on_max_reconnects.yields
           mock(STDERR).puts(" --> Oops, tried too many times! <--")
           mock(@worker).sleep(60)
-          mock(@worker).stop
+          mock(@worker).restart!
           @worker.send(:stream!, ['agent'], @agent)
         end