resque-sliders 0.1.2 → 0.2.0

data/README.md

@@ -1,8 +1,9 @@
-Resque Sliders
+Resque Sliders [![Build Status](https://secure.travis-ci.org/kmullin/resque-sliders.png)](http://travis-ci.org/kmullin/resque-sliders)
 ==============
 
 [github.com/kmullin/resque-sliders](https://github.com/kmullin/resque-sliders)
 
+
 Description
 -----------
 
@@ -14,8 +15,7 @@ From the Resque-Web UI, you can:
 * Start workers with any queue, or combination of queues on any host, and specify how many of each should be running
 * Pause / Stop / Restart ALL running workers
 
-
-ResqueSliders comes with two parts:
+ResqueSliders comes in two parts:
 
 * `KEWatcher`: A daemon that runs on any machine that needs to run Resque workers, watches over the workers and controls which ones are running
 * `Resque-Web Plugin`: A bunch of slider bars, with text-input box to specify what queues to run on the workers
@@ -25,13 +25,11 @@ Installation
 
 Install as a gem:
 
-```
-$ gem install resque-sliders
-```
+    $ gem install resque-sliders
 
 KEWatcher
 ---------
-This is the daemon component that runs on any host that you want to run Resque workers on. The daemon's job is to manage how many Resque workers should be running, and what they should be running. It also provides an easy way to stop all workers during maintenance or deploys.
+This is the daemon component that runs on any host that you want to run Resque workers on. The daemon's job is to manage **how many** Resque workers should be running, and **what** they should be running. It also provides an easy way to stop all workers during maintenance or deploys.
 
 When the daemon first runs, it will register itself, by hostname with Redis:
 
@@ -48,37 +46,61 @@ Options:
     -f, --force                      FORCE KILL ANY OTHER RUNNING KEWATCHERS
     -v, --verbose                    Verbosity (Can be specified more than once, -vv)
     -m, --max MAX                    Max Children (default: 10)
-    -t, --time TIME                  Total Time (in minutes) to wait for ALL Workers to die before having them force killed (default: 2 minutes)
-    -w, --wait WAIT_TIME             Minimum Time (in seconds) to wait for individual Worker to die at a time (default: 25 seconds)
-    -h, --help                       This help
+    -w, --wait WAIT_TIME             Time (in seconds) to wait for worker to die before sending TERM signal (default: 20 seconds)
+    -t, --time MAX_TIME              Max Time (in seconds) to wait for worker to die before sending KILL (-9) signal (FORCE QUIT) (default: 60)
+                                     NOTE: With Resque >= 1.22.0 force quit is handled for you so by default this is the same as:
+                                           RESQUE_TERM_TIMEOUT=40 or the difference of MAX_TIME and WAIT_TIME
+                                           more info: http://hone.heroku.com/resque/2012/08/21/resque-signals.html
+    -a, --async                      Do NOT wait for Resque workers to die completely before spawning new workers (default: false)
+    -V, --version                    Prints Version
+```
+
+### Important Options
+
+```
+    -m|--max MAX            (Max Children): Maximum number of workers to run on host (default: 10)
+    -w|--wait WAIT_TIME     (Wait Time): How long to wait before sending TERM to zombies (default: 20 seconds)
+    -t|--time TIME          (Total Time): How long to wait before sending KILL to zombies (default: 60 seconds)
+                            NOTE: Resque >= 1.22.0 includes signal handling of its own to force quit, so we use it if its there, and override with our own timeout here
+    -a|--async              (Async): Should we spawn new workers before old ones have fully terminated (default: false)
+    -r|--rakefile RAKEFILE  (Rakefile): Pass along a rakefile to use when calling rake ... resque:work - shouldn't be needed if run from project directory
+    -f|--force              (Force): Force any currently running KEWatcher processes to quit, waiting for it to do so, and starting in its place
+                            RAILS_ENV: If you're using rails, you need to set your RAILS_ENV variable
 ```
 
-**Important Options**
+### Controlling the Daemon
+
+Once the daemon is running on each host that is going to run Resque workers, you'll need to tell them which queues to run.
+
+The queue configuration is done via Resque-Web interface
 
-* `Max Children (-m|--max MAX)`: Maximum number of workers to run on host (default: 10)
-* `Total Time (-t|--time TIME)`: How long you want to wait before sending `TERM` to resque (like `kill -9`) (default: 2 minutes)
-* `Wait Time (-w|--wait WAIT_TIME)`: How many seconds **MINIMUM** we spend in blocking wait() call per worker when cleaning up zombies (default: 25 seconds)
-* `Rakefile (-r|--rakefile RAKEFILE)`: Pass along a rakefile to use when calling `rake ... resque:work` - shouldn't be needed if run from project directory
-* `Force (-f|--force)`: Force any currently running KEWatcher processes to QUIT, waiting for it to do so, and starting in its place
-* `RAILS_ENV`: If you're using rails, you need to set your RAILS_ENV variable
+#### Resque-Web
 
-**Controlling the Daemon**
+See below for screenshots
 
-`KEWatcher` supports all the same signals as `Resque`:
+Buttons:
 
-* `TERM`, `INT`, `QUIT`: Shutdown. Gracefully kill all child Resque workers, and wait for them to finish before exiting
-* `HUP`: Restart all Resque workers by gracefully killing them, and starting new ones in their place
-* `USR1`: Stop all Resque workers, and don't start any more
-* `USR2`: Pause spawning of new queues, but leave current ones running
-* `CONT`: Unpause. Continue spawning/managing child Resque workers
+* `Play` / `Pause` - Start or Pause
+* `Stop` - Stop all workers
+* `Reload` - Sends HUP signal to running KEWatcher
+
+#### Signals
+
+KEWatcher supports all the [same signals as Resque](https://github.com/defunkt/resque#signals):
+
+* `TERM` / `INT` / `QUIT` - Shutdown. Gracefully kill all child Resque workers, and wait for them to finish before exiting
+* `HUP`  - Restart all Resque workers by gracefully killing them, and starting new ones in their place
+* `USR1` - Stop all Resque workers, and don't start any more
+* `USR2` - Pause spawning of new queues, but leave current ones running
+* `CONT` - Unpause. Continue spawning/managing child Resque workers
 
 
 Resque-Web Integration
 ----------------------
-**Main Screen:** showing 3 hosts (node01-03), and showing that nodes 1 and 3 aren't running their KEWatchers
+**Main Screen:** showing 3 hosts, and showing that one of the nodes is not running KEWatcher
 ![Screen 1](https://github.com/kmullin/resque-sliders/raw/master/misc/resque-sliders_main-view.png)
 
-**Host Screen:** showing 3 different `QUEUE` combinations (comma separated) and slider bars indicating how many of each of them should run on node02
+**Host Screen:** showing different `QUEUE` combinations (comma separated) and slider bars indicating how many of each of them should run
 ![Screen 2](https://github.com/kmullin/resque-sliders/raw/master/misc/resque-sliders_host-view.png)
 
 To enable the Resque-Web Integration you'll need to load ResqueSliders to enable the Sliders tab. Just add:
@@ -88,15 +110,25 @@ require 'resque-sliders'
 ```
 to a file, like resque-web_init.rb, and run resque-web:
 
-```
-resque-web resque-web_init.rb
-```
+    resque-web resque-web_init.rb
 
 
-Platforms Tested
-----------------
+Works on
+--------
 
 `resque-sliders` has been tested on the following platforms:
 
-* `REE-1.8.7`
-* `Ruby-1.9.3-p0`
+#### Ruby
+
+* 1.9.3
+* 1.8.7 (ree)
+* probabaly more...
+
+Contributing
+------------
+
+Want to fix a bug? See a new feature?
+
+1. [Fork](https://github.com/kmullin/resque-sliders/fork_select) me
+2. Create a new branch
+3. Open a [Pull Request](https://github.com/kmullin/resque-sliders/pull/new)

data/bin/kewatcher

@@ -6,6 +6,7 @@ require 'rubygems'
 require 'yaml'
 require 'optparse'
 require 'resque-sliders/kewatcher'
+require 'resque-sliders/version'
 
 options = {
   :verbosity => 0,
@@ -14,6 +15,7 @@ options = {
 
 OptionParser.new do |opt|
   opt.banner = "Usage: #{File.basename($0)} [options]"
+  opt.version = Resque::Plugins::ResqueSliders::Version
 
   opt.separator ""
   opt.separator "Options:"
@@ -39,20 +41,28 @@ OptionParser.new do |opt|
     options[:verbosity] += 1
   end
 
-  opt.on("-m", "--max MAX", "Max Children (default: 10)") do |max|
-    options[:max_children] = max.to_i
+  opt.on("-m", "--max MAX", Integer, "Max Children (default: 10)") do |max|
+    options[:max_children] = max
   end
 
-  opt.on("-t", "--time TIME", "Total Time (in minutes) to wait for ALL Workers to die before having them force killed (default: 2 minutes)") do |ttime|
-    options[:ttime] = ttime.to_f
+  opt.on("-w", "--wait WAIT_TIME", Float, "Time (in seconds) to wait for worker to die before sending TERM signal (default: 20 seconds)") do |wait|
+    options[:zombie_term_wait] = wait
   end
 
-  opt.on("-w", "--wait WAIT_TIME", "Minimum Time (in seconds) to wait for individual Worker to die at a time (default: 25 seconds)") do |wait|
-    options[:wait] = wait.to_f
+  opt.on("-t", "--time MAX_TIME", Float,
+         "Max Time (in seconds) to wait for worker to die before sending KILL (-9) signal (FORCE QUIT) (default: 60)",
+         "NOTE: With Resque >= 1.22.0 force quit is handled for you so by default this is the same as:",
+         "      RESQUE_TERM_TIMEOUT=40 or the difference of MAX_TIME and WAIT_TIME",
+         "      more info: http://hone.heroku.com/resque/2012/08/21/resque-signals.html") do |wait|
+    options[:zombie_kill_wait] = wait
   end
 
-  opt.on("-h", "--help", "This help") do
-    puts opt
+  opt.on("-a", "--async", "Do NOT wait for Resque workers to die completely before spawning new workers (default: false)") do
+    options[:async] = true
+  end
+
+  opt.on("-V", "--version", "Prints Version") do
+    puts opt.version
     exit
   end
 

data/lib/resque-sliders/helpers.rb

@@ -20,11 +20,11 @@ module Resque
         end
 
         def redis_set_hash(key, field, fvalue)
-          Resque.redis.hset(key, field, fvalue) == 1 ? true : false
+          Resque.redis.hset(key, field, fvalue) == 1
         end
 
         def redis_del_hash(key, field)
-          Resque.redis.hdel(key, field) == 1 ? true : false
+          Resque.redis.hdel(key, field) == 1
         end
 
         # Return Hash: { queue => # }
@@ -48,13 +48,13 @@ module Resque
           raise 'Dont call me that' unless %w(reload pause stop).include?(sig)
           if @hostname
             # if instance variable set from running daemon, make a freshy
-            redis_get_hash_field(host_config_key, "#{@hostname}:#{sig}").to_i == 1 ? true : false
+            redis_get_hash_field(host_config_key, "#{@hostname}:#{sig}").to_i == 1
           else
             # otherwise cache call in a Hash
             @host_signal_map ||= {}
             @host_signal_map[host] ||= {}
             unless @host_signal_map[host].has_key?(sig)
-              @host_signal_map[host] = {sig => redis_get_hash_field(host_config_key, "#{host}:#{sig}").to_i == 1 ? true : false}.update(@host_signal_map[host])
+              @host_signal_map[host] = {sig => redis_get_hash_field(host_config_key, "#{host}:#{sig}").to_i == 1}.update(@host_signal_map[host])
             end
             @host_signal_map[host][sig]
           end

data/lib/resque-sliders/kewatcher.rb

@@ -14,24 +14,29 @@ module Resque
         # Verbosity level (Integer)
         attr_accessor :verbosity
 
+        attr_reader :pidfile, :zombie_term_wait, :zombie_kill_wait, :max_children
+
         # Initialize daemon with options from command-line.
         def initialize(options={})
-          @verbosity = (options[:verbosity] || 0).to_i
-          @ttime = options[:ttime] || 2
-          @zombie_wait = options[:wait] || 30
-          @hostile_takeover = options[:force]
+          @verbosity = (options[:verbosity] || 0).to_i # verbosity level
+          @zombie_term_wait = options[:zombie_term_wait] || 20 # time to wait before TERM
+          @zombie_kill_wait = ENV['RESQUE_TERM_TIMEOUT'].to_i + @zombie_term_wait unless ENV['RESQUE_TERM_TIMEOUT'].nil?
+          @zombie_kill_wait ||= options[:zombie_kill_wait] || 60 # time to wait before -9
+          @hostile_takeover = options[:force] # kill running kewatcher?
           @rakefile = File.expand_path(options[:rakefile]) rescue nil
           @rakefile = File.exists?(@rakefile) ? @rakefile : nil if @rakefile
           @pidfile = File.expand_path(options[:pidfile]) rescue nil
-          @pidfile = @pidfile =~ /\.pid/ ? @pidfile : @pidfile + '.pid' if @pidfile
+          @pidfile = @pidfile =~ /\.pid$/ ? @pidfile : @pidfile + '.pid' if @pidfile
           save_pid!
 
-          @max_children = (options[:max_children] || 5).to_i
+          @max_children = options[:max_children] || 10
           @hostname = `hostname -s`.chomp.downcase
           @pids = Hash.new # init pids array to track running children
           @need_queues = Array.new # keep track of pids that are needed
           @dead_queues = Array.new # keep track of pids that are dead
           @zombie_pids = Hash.new # keep track of zombie's we kill and dont watch(), with elapsed time we've waited for it to die
+          @async = options[:async] || false # sync and wait by default
+          @hupped = 0
 
           Resque.redis = case options[:config]
             when Hash
@@ -45,7 +50,10 @@ module Resque
         def run!(interval=0.1)
           interval = Float(interval)
           if running?
-            (puts "Already running. Restart Not Forced exiting..."; exit) unless @hostile_takeover
+            unless @hostile_takeover
+              puts "Already running. Restart Not Forced exiting..."
+              exit
+            end
             restart_running!
           end
           $0 = "KEWatcher: Starting"
@@ -58,22 +66,37 @@ module Resque
             count += 1
             log! ["watching:", @pids.keys.join(', '), "(#{@pids.keys.length})"].delete_if { |x| x == (nil || '') }.join(' ') if count % (10 / interval) == 1
 
-            tick = count % (20 / interval) == 1 ? true : false
+            tick = count % (20 / interval) == 1
             (log! "checking signals..."; check_signals) if tick
             if not (paused? || shutdown?)
               queue_diff! if tick # do first and also about every 20 seconds so we can throttle calls to redis
 
               while @pids.keys.length < @max_children && (@need_queues.length > 0 || @dead_queues.length > 0)
                 queue = @dead_queues.shift || @need_queues.shift
+                exec_string = ""
+                exec_string << 'rake'
+                exec_string << " -f #{@rakefile}" if @rakefile
+                exec_string << ' environment' if ENV['RAILS_ENV']
+                exec_string << ' resque:work'
+                env_opts = {"QUEUE" => queue}
+                if Resque::Version >= '1.22.0' # when API changed for signals
+                  term_timeout = @zombie_kill_wait - @zombie_term_wait
+                  term_timeout = term_timeout > 0 ? term_timeout : 1
+                  env_opts.merge!({
+                    'TERM_CHILD' => '1',
+                    'RESQUE_TERM_TIMEOUT' => term_timeout.to_s # use new signal handling
+                  })
+                end
+                exec_args = if RUBY_VERSION < '1.9'
+                  [exec_string, env_opts.map {|k,v| "#{k}=#{v}"}].flatten.join(' ')
+                else
+                  [env_opts, exec_string] # 1.9.x exec
+                end
                 pid = fork do
-                  exec_string = "rake#{' -f ' + @rakefile if @rakefile}#{' environment' if ENV['RAILS_ENV']} resque:work"
-                  if RUBY_VERSION < '1.9'
-                    exec(exec_string + " QUEUE=#{queue}") # 1.8.x exec
-                  else
-                    exec({"QUEUE"=>queue}, exec_string) # 1.9.x exec
-                  end
+                  srand # seed
+                  exec(*exec_args)
                 end
-                @pids.store(pid, queue) # store offset if linux fork() ?
+                @pids.store(pid, queue) # store pid and queue its running if fork() ?
                 procline
               end
             end
@@ -85,6 +108,12 @@ module Resque
 
             sleep(interval) # microsleep
             kill_zombies! unless shutdown? # need to cleanup ones we've killed
+            if @hupped > 0
+              log "HUP received; purging children..."
+              signal_hup
+              do_reload!
+              @hupped -= 1
+            end
 
             @pids.keys.each do |pid|
               begin
@@ -120,7 +149,7 @@ module Resque
             count += 1
             if count % 5 == 1
               puts "Killing running KEWatcher: #{pid}"
-              Process.kill('QUIT', pid)
+              Process.kill(:TERM, pid)
             end
             s = 3 * count
             puts "Waiting #{s}s for it to die..."
@@ -150,7 +179,7 @@ module Resque
 
           begin
             trap('QUIT') { shutdown! }
-            trap('HUP') { log "HUP received; purging children..."; signal_hup }
+            trap('HUP') { @hupped += 1 }
             trap('USR1') { log "USR1 received; killing little children..."; set_signal_flag('stop'); signal_usr1 }
             trap('USR2') { log "USR2 received; not making babies"; set_signal_flag('pause'); signal_usr2 }
             trap('CONT') { log "CONT received; making babies..."; set_signal_flag('play'); signal_cont }
@@ -170,7 +199,7 @@ module Resque
           if reload?(@hostname)
             log ' -> RELOAD from web-ui'
             signal_hup
-            @dead_queues = Array.new # clear killed queues because we're reloading in same tick as queue_diff!
+            do_reload!
           elsif stop?(@hostname)
             log ' -> STOPPED from web-ui' if not paused? or @pids.keys.length > 0
             signal_usr1
@@ -179,27 +208,29 @@ module Resque
             signal_usr2
           else
             log! ' -> Continuing; no signal found'
-            @dead_queues = Array.new if paused? # clear killed queues when entering out of pause automatically, in same tick will refresh
             signal_cont
           end
         end
 
-        def procline(status=nil)
-          status ||= 'stopped' if paused? and @pids.keys.empty?
+        def procline
+          status ||= 'stopped' if paused? and (@pids.keys.empty? and @zombie_pids.keys.empty?)
           status ||= 'paused' if paused?
-          status = "#{[@pids.keys.length,status].compact.join('-')}" unless status == 'stopped'
-          $0 = "KEWatcher (#{status}): #{@pids.keys.join(', ')}"
+          status = "#{[@pids.keys.length, @zombie_pids.keys.length, status].compact.join('-')}" unless status == 'stopped'
+          name = "KEWatcher"
+          pid_str = []
+          pid_str << "R:#{@pids.keys.join(',')}" unless @pids.keys.empty?
+          pid_str << "Z:#{@zombie_pids.keys.join(',')}" unless @zombie_pids.keys.empty?
+          $0 = "#{name} (#{status}): #{pid_str.join(' ')}"
           log! $0
         end
 
         def queue_diff!
           # Forces queue diff
           # Overrides what needs to start from Redis
-          diff = queue_diff
-          to_start = diff.first
-          to_kill = diff.last
+          to_start, to_kill = queue_diff
           to_kill.each { |pid| remove! pid }
           @need_queues = to_start # authoritative answer from redis of what needs to be running
+          @dead_queues = Array.new
         end
 
         def queue_diff
@@ -209,8 +240,6 @@ module Resque
 
           goal, to_start, to_kill = [], [], []
           queue_values(@hostname).each_pair { |queue,count| goal += [queue] * count.to_i }
-          # to sort or not to sort?
-          # goal.sort!
 
           running_queues = @pids.values # check list
           goal.each do |q|
@@ -257,10 +286,19 @@ module Resque
           procline
         end
 
+        def do_reload!
+          while not @async and @zombie_pids.length > 0
+            kill_zombies!
+          end
+        end
+
         def shutdown!
           log "Exiting..."
           @shutdown = true
           kill_children
+          while @zombie_pids.keys.length > 0
+            kill_zombies!
+          end
           %w(current max).each { |x| unregister_setting("#{x}_children") }
           log! "Unregistered Max Children"
           Process.waitall()
@@ -300,47 +338,49 @@ module Resque
 
         def kill_zombies!
           return if @zombie_pids.empty?
-          zombies = @zombie_pids.dup
-          wait = 60 * @ttime / zombies.length # in seconds
-          mark = Time.now # start of loop
-          zombies.each do |pid,elapsed|
-            elapsed += Time.now - mark
-            mark = Time.now # mark that we updated elapsed; time becomes relative
-            time_left = (@ttime * 60.0) - elapsed # seconds
-            wait = time_left < wait ? time_left : wait
-            wait = @zombie_wait if wait < @zombie_wait && wait > 0
-            wait = 0.1 if wait <= 0
-            log! "Waiting for Zombie: #{pid} (#{'%.2f' % wait} seconds) => #{'%.2f' % elapsed} elapsed"
+          local_zombies = @zombie_pids.dup
+          to_delete = []
+          local_zombies.each do |pid,kill_data|
             begin
+              when_killed, times_killed = kill_data
+              elapsed = Time.now - when_killed
+              sig = if elapsed >= @zombie_term_wait and times_killed == 1
+                :TERM
+              elsif elapsed >= @zombie_kill_wait and not Resque::Version >= '1.22.0'
+                :KILL
+              else
+                nil
+              end
+              unless sig.nil?
+                log "Waited more than #{@zombie_term_wait} seconds for #{pid}. Sending #{sig}..."
+                Process.kill(sig, pid)
+                @zombie_pids.merge!({pid => [when_killed, times_killed + 1]})
+              end
+              wait = !@async ? (@zombie_term_wait - elapsed) / @zombie_pids.length : 0.01
+              wait = wait > 0 ? wait : 0.01
               # Issue wait() to make sure pid isn't forgotten
               Timeout::timeout(wait) { Process.wait(pid) }
+              to_delete << pid
+              next
             rescue Timeout::Error
-              elapsed += Time.now - mark
-              mark = Time.now # mark that we updated elapsed
-              log! "TIMEOUT waiting for zombie #{pid} => #{'%.2f' % elapsed} elapsed"
-              (log "Waited more than #{@ttime} minutes for #{pid}. Force quitting..."; Process.kill('TERM',pid)) if elapsed / 60.0 >= @ttime
+              # waited too long so just catch and ignore, and continue
+            rescue Errno::ESRCH, Errno::ECHILD # child is gone
+              to_delete << pid
               next
-            rescue Errno::ECHILD # child is gone
-            ensure
-              elapsed += Time.now - mark
-              mark = Time.now # mark that we updated elapsed
-              log! "Elapsed incr: #{elapsed}"
-              zombies.each_key { |x| zombies[x] = elapsed } # reset all to current elapsed
-              @zombie_pids = zombies # make sure to update root Hash
             end
-            @zombie_pids.delete(pid)
           end
+          to_delete.each { |pid| @zombie_pids.delete(pid) }
         end
 
         def kill_child(pid)
           begin
-            Process.kill("QUIT", pid) # try graceful shutdown
+            Process.kill(:QUIT, pid) # try graceful shutdown
             log! "Child #{pid} killed. (#{@pids.keys.length-1})"
           rescue Object => e # dunno what this does but it works; dont know exception
             log! "Child #{pid} already dead, sad day. (#{@pids.keys.length-1}) #{e}"
           ensure
-            # Keep track of ones we issued QUIT to
-            @zombie_pids[pid] = 0 # set to 0 wait time
+            # Keep track of ones we've killed
+            @zombie_pids[pid] = [Time.now, 1] # set to current time, killed #
           end
         end
 

data/lib/resque-sliders/server.rb

@@ -15,7 +15,7 @@ module Resque
               public_view(params[key], key == 'img' ? 'images' : key)
             else
               @sliders = Commander.new
-              redirect "/sliders/#{@sliders.all_hosts.first}" if @sliders.all_hosts.length == 1
+              redirect url_path("/sliders/#{@sliders.all_hosts.first}") if @sliders.all_hosts.length == 1
               slider_view :index
             end
           end
@@ -51,10 +51,10 @@ module Resque
             end
 
             def public_view(filename, dir='')
+              file = File.join(PUBLIC_PATH, dir, filename)
               begin
                 cache_control :public, :max_age => 1800
-                file = File.join(PUBLIC_PATH, dir, filename)
-                send_file file, :last_modified => File.mtime(file)
+                send_file file
               rescue Errno::ENOENT
                 404
               end

data/lib/resque-sliders/server/public/css/jqueryui-1.8.16/blitzer/jquery-ui.custom.css

@@ -59,26 +59,26 @@
 .ui-widget { font-family: Arial,sans-serif; font-size: 1.1em; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #eeeeee; background: #ffffff url(/sliders?img=ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #333333; }
+.ui-widget-content { border: 1px solid #eeeeee; background: #ffffff url(?img=ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #333333; }
 .ui-widget-content a { color: #333333; }
-.ui-widget-header { border: 1px solid #e3a1a1; background: #cc0000 url(/sliders?img=ui-bg_highlight-soft_15_cc0000_1x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header { border: 1px solid #e3a1a1; background: #cc0000 url(?img=ui-bg_highlight-soft_15_cc0000_1x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
 .ui-widget-header a { color: #ffffff; }
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d8dcdf; background: #eeeeee url(/sliders?img=ui-bg_highlight-hard_100_eeeeee_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #004276; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d8dcdf; background: #eeeeee url(?img=ui-bg_highlight-hard_100_eeeeee_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #004276; }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #004276; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #cdd5da; background: #f6f6f6 url(/sliders?img=ui-bg_highlight-hard_100_f6f6f6_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #111111; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #cdd5da; background: #f6f6f6 url(?img=ui-bg_highlight-hard_100_f6f6f6_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #111111; }
 .ui-state-hover a, .ui-state-hover a:hover { color: #111111; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #eeeeee; background: #ffffff url(/sliders?img=ui-bg_flat_65_ffffff_40x100.png) 50% 50% repeat-x; font-weight: bold; color: #cc0000; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #eeeeee; background: #ffffff url(?img=ui-bg_flat_65_ffffff_40x100.png) 50% 50% repeat-x; font-weight: bold; color: #cc0000; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #cc0000; text-decoration: none; }
 .ui-widget :active { outline: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcd3a1; background: #fbf8ee url(/sliders?img=ui-bg_glass_55_fbf8ee_1x400.png) 50% 50% repeat-x; color: #444444; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcd3a1; background: #fbf8ee url(?img=ui-bg_glass_55_fbf8ee_1x400.png) 50% 50% repeat-x; color: #444444; }
 .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #444444; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cc0000; background: #f3d8d8 url(/sliders?img=ui-bg_diagonals-thick_75_f3d8d8_40x40.png) 50% 50% repeat; color: #2e2e2e; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cc0000; background: #f3d8d8 url(?img=ui-bg_diagonals-thick_75_f3d8d8_40x40.png) 50% 50% repeat; color: #2e2e2e; }
 .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #2e2e2e; }
 .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #2e2e2e; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
@@ -89,14 +89,14 @@
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(/sliders?img=ui-icons_cc0000_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(/sliders?img=ui-icons_cc0000_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(/sliders?img=ui-icons_ffffff_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(/sliders?img=ui-icons_cc0000_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(/sliders?img=ui-icons_cc0000_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(/sliders?img=ui-icons_cc0000_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(/sliders?img=ui-icons_004276_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(/sliders?img=ui-icons_cc0000_256x240.png); }
+.ui-icon { width: 16px; height: 16px; background-image: url(?img=ui-icons_cc0000_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(?img=ui-icons_cc0000_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(?img=ui-icons_ffffff_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(?img=ui-icons_cc0000_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(?img=ui-icons_cc0000_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(?img=ui-icons_cc0000_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(?img=ui-icons_004276_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(?img=ui-icons_cc0000_256x240.png); }
 
 /* positioning */
 .ui-icon-carat-1-n { background-position: 0 0; }
@@ -286,8 +286,8 @@
 .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; -khtml-border-bottom-right-radius: 6px; border-bottom-right-radius: 6px; }
 
 /* Overlays */
-.ui-widget-overlay { background: #a6a6a6 url(/sliders?img=ui-bg_dots-small_65_a6a6a6_2x2.png) 50% 50% repeat; opacity: .40;filter:Alpha(Opacity=40); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #333333 url(/sliders?img=ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x; opacity: .10;filter:Alpha(Opacity=10); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+.ui-widget-overlay { background: #a6a6a6 url(?img=ui-bg_dots-small_65_a6a6a6_2x2.png) 50% 50% repeat; opacity: .40;filter:Alpha(Opacity=40); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #333333 url(?img=ui-bg_flat_0_333333_40x100.png) 50% 50% repeat-x; opacity: .10;filter:Alpha(Opacity=10); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
  * jQuery UI Resizable 1.8.16
  *
  * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)

data/lib/resque-sliders/server/public/js/sliders.js

@@ -34,7 +34,9 @@ $(document).ready(function() {
     signal[sig] = true;
 
     var span = $(this);
-    $.post('/sliders/' + host, signal, function(data) {
+    var re = new RegExp('/' + host + '$');
+    var url = window.location.pathname.replace(re, '') + '/' + host;
+    $.post(url, signal, function(data) {
       switch(data.signal) {
         case 'reload':
           span.removeClass('ui-icon-refresh').addClass('ui-icon-alert').attr('id', [host, 'ALERT'].join(':'));
@@ -55,7 +57,7 @@ $(document).ready(function() {
     e.preventDefault();
     var queue = sanitize_input($("#new_queue").val());
     var host = $(this).attr("id");
-    $.post('/sliders/' + host, { quantity: 1, queue: queue }, function(data) {
+    $.post(host, { quantity: 1, queue: queue }, function(data) {
       // reload window
       window.location.reload(true);
     });
@@ -83,7 +85,7 @@ $(document).ready(function() {
         set_total();
       },
       change: function( event, ui ) {
-        $.post('/sliders/' + host, { quantity: ui.value, queue: queue }, function(data) {
+        $.post('', { quantity: ui.value, queue: queue }, function(data) {
         });
       },
     });

data/lib/resque-sliders/server/views/index.erb

@@ -3,10 +3,10 @@
 <h1>Sliders</h1>
 
 <div id="sliders">
-  <link href="/sliders?css=sliders.css" rel="stylesheet" type="text/css" />
-  <link href="/sliders?css=jqueryui-1.8.16/blitzer/jquery-ui.custom.css" rel="stylesheet" type="text/css" />
-  <script src="/sliders?js=jquery-ui-1.8.16.custom.min.js" type="text/javascript"></script>
-  <script src="/sliders?js=sliders.js" type="text/javascript"></script>
+  <link href="<%= url_path("/sliders?css=sliders.css") %>" rel="stylesheet" type="text/css" />
+  <link href="<%= url_path("/sliders?css=jqueryui-1.8.16/blitzer/jquery-ui.custom.css") %>" rel="stylesheet" type="text/css" />
+  <script src="<%= url_path("/sliders?js=jquery-ui-1.8.16.custom.min.js") %>" type="text/javascript"></script>
+  <script src="<%= url_path("/sliders?js=sliders.js") %>" type="text/javascript"></script>
 <% if params[:host] || @sliders.all_hosts.length == 1 %>
   <% host = params[:host] || @sliders.all_hosts.first %>
   <% max = @sliders.max_children(host) || 'Not running' %>
@@ -36,7 +36,7 @@
     </tr>
     <% @sliders.all_hosts.each do |host| %>
     <tr>
-      <td><a href="/sliders/<%= host %>"><%= host %></a></td>
+      <td><a href="<%= url_path("/sliders/#{host}") %>"><%= host %></a></td>
       <td><% if @sliders.stale_hosts.include?(host) %>
       Not Checked in (Stale)
       <% else %>

data/lib/resque-sliders/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module ResqueSliders
-      Version = VERSION = '0.1.2'
+      Version = VERSION = '0.2.0'
     end
   end
 end

data/test/kewatcher_test.rb

@@ -0,0 +1,44 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'tempfile'
+
+context "kewatcher" do
+  setup do
+    Resque.redis.flushall
+    pidfile = Tempfile.new('pidfile')
+    @options = {
+      :pidfile => pidfile.path,
+      :config => '127.0.0.1:9736'
+    }
+    @kewatcher = Resque::Plugins::ResqueSliders::KEWatcher.new(@options)
+  end
+
+  teardown do
+    pid = @kewatcher.running?
+    Process.kill(:TERM, pid) if pid
+  end
+
+  test "kewatcher" do
+    assert_instance_of Resque::Plugins::ResqueSliders::KEWatcher, @kewatcher
+  end
+
+  test "saves pidfile" do
+    assert File.exists?(@kewatcher.pidfile)
+  end
+
+  test "kewatcher runs" do
+    `bundle exec kewatcher --config #{@options[:config]} >/dev/null 2>&1 & sleep 3`
+    assert @kewatcher.running?
+  end
+
+  test "kewatcher wont run twice" do
+    `bundle exec kewatcher --config #{@options[:config]} >/dev/null 2>&1 &`
+    sleep 3
+    output = `bundle exec kewatcher --config #{@options[:config]}`
+    assert_match %r{Already running}, output
+  end
+
+  test "system forks" do
+    assert fork { exit }
+  end
+
+end

data/test/redis-test.conf

@@ -14,7 +14,7 @@ port 9736
 # If you want you can bind a single interface, if the bind option is not
 # specified all the interfaces will listen for connections.
 #
-# bind 127.0.0.1
+bind 127.0.0.1
 
 # Close the connection after a client is idle for N seconds (0 to disable)
 timeout 300

data/test/test_helper.rb

@@ -13,7 +13,7 @@ begin
 rescue LoadError
 end
 require 'resque'
-require 'resque-sliders'
+require 'resque-sliders/kewatcher'
 
 #
 # make sure we can run redis

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-sliders
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -48,7 +48,6 @@ extra_rdoc_files:
 files:
 - MIT-LICENSE
 - README.md
-- Rakefile
 - bin/kewatcher
 - config/config_example.yml
 - lib/resque-sliders.rb
@@ -74,8 +73,8 @@ files:
 - lib/resque-sliders/server/public/js/sliders.js
 - lib/resque-sliders/server/views/index.erb
 - lib/resque-sliders/version.rb
+- test/kewatcher_test.rb
 - test/redis-test.conf
-- test/resque-sliders_test.rb
 - test/test_helper.rb
 homepage: https://github.com/kmullin/resque-sliders
 licenses: []
@@ -89,12 +88,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 430698583574743090
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 430698583574743090
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -103,6 +108,6 @@ specification_version: 3
 summary: ! 'Resque-Sliders: a plugin for resque that controls which resque workers
   are running on each host, from within Resque-web'
 test_files:
+- test/kewatcher_test.rb
 - test/redis-test.conf
-- test/resque-sliders_test.rb
 - test/test_helper.rb

data/Rakefile

@@ -1,41 +0,0 @@
-$LOAD_PATH.unshift 'helpers'
-$LOAD_PATH.unshift 'lib'
-#
-# Setup
-#
-
-
-require 'bundler/gem_tasks'
-require 'resque/tasks'
-require 'resque_job'
-
-def command?(command)
-  system("type #{command} > /dev/null 2>&1")
-end
-
-
-#
-# Tests
-#
-
-task :default => :test
-
-desc "Run the test suite"
-task :test do
-  rg = command?(:rg)
-  Dir['test/**/*_test.rb'].each do |f|
-    rg ? sh("rg #{f}") : ruby(f)
-  end
-end
-
-desc "Bump version"
-task :git_tag_version do
-  require 'resque-sliders/version'
-  git_tags = `git tag -l`.split.map { |x| x.gsub(/v/, '') }
-  version = Resque::Plugins::ResqueSliders::Version
-  commit_sha = `git log -1 HEAD|head -n1|awk '{print $2}'`
-  unless git_tags.include?(version)
-    (puts version, commit_sha; `git tag v#{version} #{commit_sha}`)
-    `rake build`
-  end
-end

data/test/resque-sliders_test.rb

@@ -1,12 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-
-context "ResqueSliders" do
-  setup do
-    Resque.redis.flushall
-  end
-
-  test "sliders" do
-    ret = 1
-    assert_equal 1, ret
-  end
-end