resque_worker_heartbeat 0.1.0 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjM5MGNjODExZjhhNzJjOTAxNjU0ZTJmZjE0MGM3NmViYmNkM2I4Ng==
+    MGQ3NzhhZWM4OGI4MzU2ZTU2NmE0YTA5YWY1OTVjYjhjMTljMmFkZQ==
   data.tar.gz: !binary |-
-    ZTk3NDY4ZjgyNjcwOGM3YzZjZmJhM2YxYjc1ZWE2OWVlODg4OTNmZQ==
+    YTJiODg3ZTFiNjEwYTgwNjk0MDk0Nzc5MDQ3YTNlZmQ4Yjc5ZDY3Yw==
 SHA512:
   metadata.gz: !binary |-
-    MDk5NDdhMjkyMzljZGY1ZjI5MWYxZWQ3NmI5YzYxM2ZjMWUxNjlmOWEyOTAz
-    ZTQ1MmQyNTE0NWEwMDUzYzEwZDVhN2Q3OTJlZmZjYjliMDE2YTA1YzdiOGI2
-    NDM3ZGJiMDcwOTE0Nzg1NDk4ODI2MDZhNzM2N2U3NTkzZTBmZWY=
+    NGI1YWNkNjljOWRiOTFiYWFmOWViNTA3YThkZGUzNzkyNzk5MWM0YzRhYTA0
+    MDZlMjY2ZmRhNzA1ZDZhZmVjMjYwODU0MDk2MzkyNWZkNDU0MDJmOGU2OGI5
+    NmM0YWI2NzYwMTlhOTljNGEwMWE2YzdlYWRkZmM0OGEyNGNjZGM=
   data.tar.gz: !binary |-
-    MmQ1OGY1ZTQzZTJmNTE0MDllNGJkN2I3ZjA3YTY1YzdjNDU4NDAzYzg0NjA0
-    MzVmOWNlY2JjYjBjODI5ODI1ZmRjYTZmOWE1NGQ0NmQyODAzNjk0ZjhkMGRj
-    NGM0ODYyNjNkMDI4YTBlMTY0ODhmZjdiODNhMDlkYjdkYmE0NWM=
+    Mjc1MjY3NTI3ZjNhZjkyN2FhYjI4NDNhMDUxZmYzMDYwYjc1ODY1N2M0YWFj
+    N2ZiMzE1NDQ3ZTk2OTU0YTE2YzkyNmMxNTIzZmFlMDBiZjZkZWM2ZDlkYWRi
+    NzRkN2RlMzllZjRkOTI0NDI2MDcwMDEwZjExMWI4MjEwYjcwOGY=

data/lib/resque/heartbeat.rb

@@ -9,9 +9,15 @@ module Resque
     end
     alias_method(:startup, :startup_with_heartbeat)
 
+    def is_me?
+      pieces = id.split(':')
+      (pieces[0].casecmp(hostname)==0) && (pieces[1].to_i == Process.pid)
+    end
+
     alias_method(:unregister_worker_without_heartbeat, :unregister_worker)
     def unregister_worker_with_heartbeat(*args)
-      heart.stop
+      to_stop = is_me? ? heart : Heart.new(self)
+      to_stop.stop
       unregister_worker_without_heartbeat(*args)
     end
     alias_method(:unregister_worker, :unregister_worker_with_heartbeat)
@@ -21,7 +27,11 @@ module Resque
     end
 
     def remote_hostname
-      id.split(':').first
+      @remote_hostname ||= id.split(':').first
+    end
+    
+    def remote_pid
+      @remote_pid ||= id.split(':')[1]
     end
 
     def dead?
@@ -55,7 +65,7 @@ module Resque
         @thrd ||= Thread.new do
           loop do
             begin
-              beat! && sleep(2)
+              beat! && sleep(Heart.heartbeat_interval_seconds)
             rescue Exception => e
               Resque.logger.error "Error while doing heartbeat: #{e} : #{e.backtrace}"
             end
@@ -64,7 +74,7 @@ module Resque
       end
 
       def stop
-        Thread.kill(@thrd)
+        Thread.kill(@thrd) if @thrd
         redis.del key
       rescue
         nil
@@ -75,19 +85,19 @@ module Resque
       end
 
       # you can send a redis wildcard to filter the workers you're looking for
-      def Heart.heartbeat_key(worker_name)
-        "worker:#{worker_name}:heartbeat"
+      def Heart.heartbeat_key(worker_name, pid)
+        "worker:#{worker_name}:#{pid}:heartbeat"
       end
 
       def key
-        Heart.heartbeat_key worker.remote_hostname
+        Heart.heartbeat_key(worker.remote_hostname, worker.remote_pid)
       end
 
       def beat!
         redis.sadd(:workers, worker)
         redis.setex(key, Heart.heartbeat_interval_seconds * Heart.heartbeats_before_dead, '')
       rescue Exception => e
-        Resque.logger.fatal "Unable to set the heartbeat for worker '#{worker.remote_hostname}': #{e} : #{e.backtrace}"
+        Resque.logger.fatal "Unable to set the heartbeat for worker '#{worker.remote_hostname}:#{worker.remote_pid}': #{e} : #{e.backtrace}"
       end
 
       def dead?
@@ -103,7 +113,7 @@ module Resque
   # NOTE: this assumes all of your workers are putting out heartbeats
   def self.prune_dead_workers!
     begin
-      beats = Resque.redis.keys(Worker::Heart.heartbeat_key('*'))
+      beats = Resque.redis.keys(Worker::Heart.heartbeat_key('*', '*'))
       Worker.all.each do |worker|
         worker.prune_if_dead
 
@@ -117,7 +127,7 @@ module Resque
         Resque.redis.del key
       end
     rescue Exception => e
-      p e
+      Resque.logger.error "#{e.message} #{e.backtrace}"
     end
   end
 

data/lib/resque_worker_heartbeat/version.rb

@@ -1,3 +1,3 @@
 module ResqueWorkerHeartbeat
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_worker_heartbeat
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sven Fuchs