Do check restarting LongRunnable::Worker for liveliness

Fixes a memory leak caused by starting a new Worker when the old one is still restarting.

app/concerns/long_runnable.rb

@@ -51,12 +51,13 @@ def setup_worker
   end
 
   class Worker
-    attr_reader :thread, :id, :agent, :config, :mutex, :scheduler
+    attr_reader :thread, :id, :agent, :config, :mutex, :scheduler, :restarting
 
     def initialize(options = {})
       @id = options[:id]
       @agent = options[:agent]
       @config = options[:config]
+      @restarting = false
     end
 
     def run
@@ -65,6 +66,7 @@ def run
 
     def run!
       @thread = Thread.new do
+        Thread.current[:name] = "#{id}-#{Time.now}"
         begin
           run
         rescue SignalException, SystemExit
@@ -95,9 +97,11 @@ def stop!
     end
 
     def restart!
-      stop!
-      setup!(scheduler, mutex)
-      run!
+      without_alive_check do
+        stop!
+        setup!(scheduler, mutex)
+        run!
+      end
     end
 
     def every(*args, &blk)
@@ -120,5 +124,12 @@ def boolify(value)
     def schedule(method, args, &blk)
       @scheduler.send(method, *args, tag: id, &blk)
     end
+
+    def without_alive_check(&blk)
+      @restarting = true
+      yield
+    ensure
+      @restarting = false
+    end
   end
 end

lib/agent_runner.rb

@@ -100,7 +100,7 @@ def load_workers
 
   def restart_dead_workers
     @workers.each_pair do |id, worker|
-      if worker.thread && !worker.thread.alive?
+      if !worker.restarting && worker.thread && !worker.thread.alive?
         puts "Restarting #{id.to_s}"
         @workers[id].run!
       end