resque-sliders 0.2.1 → 0.2.2

data/lib/resque-sliders/commander.rb

@@ -10,12 +10,17 @@ module Resque
 
         def initialize
           @host_status = redis_get_hash(host_config_key)
-          @stale_hosts = Resque.redis.keys("#{key_prefix}:*").map { |x| y = x.split(':').last; y unless x == host_config_key or hosts.include?(y) }.compact.sort
+          @stale_hosts = Resque.redis.smembers(known_hosts_key) - hosts
         end
 
         # Return Array of currently online hosts
         def hosts
-          @host_status.keys.select { |x| x unless %w(reload pause stop).include? x.split(':').last }.map { |x| x.split(':').first }.uniq.sort
+          Set.new.tap do |l|
+            @host_status.keys.each do |x|
+              x = x.split(':')
+              l << x.first unless %w(reload pause stop).include?(x.last)
+            end
+          end.to_a.sort
         end
 
         # Array of all hosts (current + stale)
@@ -23,6 +28,18 @@ module Resque
           (hosts + stale_hosts).sort
         end
 
+        # Remove all keys for a host (clean)
+        def remove_all_host_keys(hostname)
+          # expensive process O(N)
+          keys_to_delete = Resque.redis.keys("#{key_prefix}:*").select { |k| name = k.split(':').last; hostname == name }
+          # look at config hash, remove fields if relate to this hostname
+          fields_to_delete = redis_get_hash(host_config_key).keys.select { |k| name = k.split(':').first; hostname == name }
+          # do delete
+          Resque.redis.del(keys_to_delete) unless keys_to_delete.empty?
+          redis_del_hash(host_config_key, fields_to_delete) unless fields_to_delete.empty?
+          del_from_known_hosts(hostname)
+        end
+
         # Return current children count or nil if Host hasn't registered itself.
         def current_children(host)
           @host_status["#{host}:current_children"].to_i if max_children(host)

data/lib/resque-sliders/helpers.rb

@@ -3,12 +3,28 @@ module Resque
     module ResqueSliders
       module Helpers
 
+        # prefix to all keys our plugin uses in redis
         def key_prefix
           "plugins:resque-sliders"
         end
 
+        # we store everything in this hash
         def host_config_key
-          "plugins:resque-sliders:host_configs"
+          "#{key_prefix}:host_configs"
+        end
+
+        # used to keep track of hosts we know about
+        def known_hosts_key
+          "#{key_prefix}:known_hosts"
+        end
+
+        def add_to_known_hosts(hostname)
+          # add a hostname to the hosts set
+          Resque.redis.sadd(known_hosts_key, hostname)
+        end
+
+        def del_from_known_hosts(hostname)
+          Resque.redis.srem(known_hosts_key, hostname)
         end
 
         def redis_get_hash(key)

data/lib/resque-sliders/kewatcher.rb

@@ -163,6 +163,7 @@ module Resque
           register_signal_handlers
           clean_signal_settings
           register_setting('max_children', @max_children)
+          add_to_known_hosts(@hostname)
           log! "Registered Max Children with Redis"
           $stdout.sync = true
         end
@@ -361,12 +362,10 @@ module Resque
               # Issue wait() to make sure pid isn't forgotten
               Timeout::timeout(wait) { Process.wait(pid) }
               to_delete << pid
-              next
             rescue Timeout::Error
               # waited too long so just catch and ignore, and continue
             rescue Errno::ESRCH, Errno::ECHILD # child is gone
               to_delete << pid
-              next
             end
           end
           to_delete.each { |pid| @zombie_pids.delete(pid) }

data/lib/resque-sliders/server.rb

@@ -45,6 +45,11 @@ module Resque
             end
           end
 
+          # we need the ability to remove old hosts
+          app.delete '/sliders/:host' do
+            Commander.new.remove_all_host_keys(params[:host])
+          end
+
           app.helpers do
             def slider_view(filename, options={}, locals={})
               erb(File.read(File.join(VIEW_PATH, "#{filename}.erb")), options, locals)

data/lib/resque-sliders/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module ResqueSliders
-      Version = VERSION = '0.2.1'
+      Version = VERSION = '0.2.2'
     end
   end
 end

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: resque-sliders
 version: !ruby/object:Gem::Version
-  version: 0.2.1
   prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - Kevin Mullin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
+  type: :runtime
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,10 +22,8 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -33,6 +31,8 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
+    none: false
+  prerelease: false
 description: ! "    Resque-Sliders is a plugin for Resque that enables you to control
   multiple hosts'\n    running resque workers with a monitor PID watching over them.
   \ From the resque-web UI, you\n    can add/delete/change which queues are running
@@ -83,26 +83,26 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 3990848849096963840
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: -2979142470906782605
+      version: '0'
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 3990848849096963840
+      hash: -2979142470906782605
+      version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ! 'Resque-Sliders: a plugin for resque that controls which resque workers