resque-sliders 0.0.4 → 0.0.5

data/lib/resque-sliders/commander.rb

@@ -15,7 +15,7 @@ module Resque
 
         # Return Array of currently online hosts
         def hosts
-          @host_status.keys.select { |x| x unless x.split(':').last == 'reload' }.map { |x| x.split(':').first }.uniq.sort
+          @host_status.keys.select { |x| x unless %w(reload pause stop).include? x.split(':').last }.map { |x| x.split(':').first }.uniq.sort
         end
 
         # Array of all hosts (current + stale)
@@ -62,11 +62,6 @@ module Resque
           redis_del_hash("#{key_prefix}:#{host}", queue)
         end
 
-        # Sets reload flag on field of config_key to reload host's KEWatcher
-        def reload(host)
-          redis_set_hash(host_config_key, "#{host}:reload", 1)
-        end
-
       end
     end
   end

data/lib/resque-sliders/helpers.rb

@@ -36,15 +36,28 @@ module Resque
           redis_set_hash(host_config_key, "#{@hostname}:#{setting}", value)
         end
 
+        def unregister_setting(setting)
+          redis_del_hash(host_config_key, "#{@hostname}:#{setting}")
+        end
 
         # Signal Checking
 
-
         # Gets signal field in redis config_key for this host. Don't call directly
         def check_signal(host)
           sig = caller[0][/`([^']*)'/, 1].gsub('?', '')
           raise 'Dont call me that' unless %w(reload pause stop).include?(sig)
-          redis_get_hash_field(host_config_key, "#{host}:#{sig}").to_i == 1 ? true : false
+          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
+          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])
+            end
+            @host_signal_map[host][sig]
+          end
         end
 
         def reload?(host)
@@ -59,12 +72,15 @@ module Resque
           check_signal(host)
         end
 
-        # Return Hash of signals for host and their values
-        #def check_redis_for_signals(host)
-        #  configs = redis_get_hash(host_config_key)
-        #  signals = %w(reload pause stop).map { |x| [host,x].join(':') }
-        #  Hash[configs.delete_if { |k,v| ! signals.include?(k) }.map { |k,v| [k.split(':').last.to_sym ,v] }]
-        #end
+        # Set signal key given signal, host
+        def set_signal_flag(sig, host=@hostname)
+          @hostname ||= host
+          if sig == 'play'
+            %w(pause stop).each { |x| unregister_setting(x) }
+          else
+            register_setting(sig, 1)
+          end
+        end
 
       end
     end

data/lib/resque-sliders/kewatcher.rb

@@ -51,26 +51,26 @@ 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
+            (log! "checking signals..."; check_signals) if tick
             if not (paused? || shutdown?)
-              if count % (20 / interval) == 1
-                # do first and also about every 20 seconds so we can throttle calls to redis
-                queue_diff!
-                signal_hup if check_reload and not count == 1
-                procline @pids.keys.join(', ')
-              end
+              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
                 @pids.store(fork { exec("rake#{' -f ' + @rakefile if @rakefile}#{' environment' if ENV['RAILS_ENV']} resque:work QUEUE=#{queue}") }, queue) # store offset if linux fork() ?
-                procline @pids.keys.join(', ')
+                procline
               end
             end
 
             register_setting('current_children', @pids.keys.length) if old != @pids.length
             old = @pids.length
 
+            procline if tick
+
             sleep(interval) # microsleep
             kill_zombies! # need to cleanup ones we've killed
+
             @pids.keys.each do |pid|
               begin
                 # check to see if pid is running, by waiting for it, with a timeout
@@ -97,15 +97,6 @@ module Resque
 
         private
 
-        def check_reload
-          (unregister_setting('reload'); return true) if reload?(@hostname)
-          false
-        end
-
-        def unregister_setting(setting)
-          redis_del_hash(host_config_key, "#{@hostname}:#{setting}")
-        end
-
         # Forces (via signal QUIT) any KEWatcher process running, located by ps and grep
         def restart_running!
           count = 0
@@ -126,6 +117,7 @@ module Resque
           log! "Found RAILS_ENV=#{ENV['RAILS_ENV']}" if ENV['RAILS_ENV']
           enable_gc_optimizations
           register_signal_handlers
+          clean_signal_settings
           register_setting('max_children', @max_children)
           log! "Registered Max Children with Redis"
           $stdout.sync = true
@@ -143,10 +135,10 @@ module Resque
 
           begin
             trap('QUIT') { shutdown! }
-            trap('HUP') { signal_hup }
-            trap('USR1') { signal_usr1 }
-            trap('USR2') { signal_usr2 }
-            trap('CONT') { signal_cont }
+            trap('HUP') { log "HUP received; purging children..."; signal_hup }
+            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 }
           rescue ArgumentError
             warn "Signals QUIT, USR1, USR2, and/or CONT not supported."
           end
@@ -154,8 +146,34 @@ module Resque
           log! "Registered signals"
         end
 
-        def procline(string)
-          $0 = "KEWatcher (#{@pids.keys.length}): #{string}"
+        def clean_signal_settings
+          %w(pause stop reload).each { |x| unregister_setting(x) }
+        end
+
+        # Check signals, do appropriate thing
+        def check_signals
+          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!
+          elsif stop?(@hostname)
+            log ' -> STOPPED from web-ui' if not paused? or @pids.keys.length > 0
+            signal_usr1
+          elsif pause?(@hostname)
+            log ' -> PAUSED from web-ui' unless paused?
+            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?
+          status ||= 'paused' if paused?
+          status = "#{[@pids.keys.length,status].compact.join('-')}" unless status == 'stopped'
+          $0 = "KEWatcher (#{status}): #{@pids.keys.join(', ')}"
           log! $0
         end
 
@@ -210,18 +228,18 @@ module Resque
           [to_start, to_kill] # return whats left
         end
 
+        # removes pid completely, ignores its queues
         def remove!(pid)
-          # removes pid completely, ignores its queues
           kill_child pid
           @pids.delete(pid)
-          procline @pids.keys.join(', ')
+          procline
         end
 
+        # remove pid, and respawn same queues
         def remove(pid)
-          # remove pid, and respawn same queues
           @dead_queues.unshift(@pids[pid]) # keep track of queues that pid was running, put it at front of list
           @pids.delete(pid)
-          procline @pids.keys.join(', ')
+          procline
         end
 
         def shutdown!
@@ -242,25 +260,26 @@ module Resque
           @paused
         end
 
+        # Reload
         def signal_hup
-          log "HUP received; purging children..."
+          clean_signal_settings
           kill_children
           @paused = false # unpause after kill (restart child)
         end
 
+        # Stop
         def signal_usr1
-          log "USR1 received; killing little children..."
           kill_children
           @paused = true # pause after kill cause we're paused
         end
 
+        # Pause
         def signal_usr2
-          log "USR2 received; not making babies"
           @paused = true # paused again
         end
 
+        # Continue
         def signal_cont
-          log "CONT received; making babies..."
           @paused = false # unpause
         end
 

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

@@ -1,8 +1,10 @@
 .icons {
   float: left;
+  margin: 0 2.5px 0 2.5px;
 }
 .corner {
   float: right;
+  margin: 2px 2.5px 0 2.5px;
 }
 #sliders {
   padding: 10px;

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

@@ -16,14 +16,40 @@ $(document).ready(function() {
     });
     return new_ary.join(',');
   };
-  // Click function for all HUP icons
-  $(".HUP").click(function() {
-    var host = $(this).attr("id").replace('-HUP', '');
-    $.post('/sliders/' + host, { reload: true }, function(data) {
-      // FIXME
-      // this should just show the alert icon
-      window.location.reload();
-    });
+  // Click function for all icons
+  $(".ui-icon").click(function() {
+    var host_sig = $(this).attr("id").split('-');
+    var host = host_sig[0];
+    switch(host_sig[1])
+    {
+      case 'REFRESH':
+        sig = 'reload';
+        break;
+      case 'ALERT':
+        return false;
+      default:
+        sig = host_sig[1].toLowerCase();
+    }
+    var signal = {};
+    signal[sig] = true;
+
+    var span = $(this);
+    $.post('/sliders/' + host, signal, function(data) {
+      switch(data.signal) {
+        case 'reload':
+          span.removeClass('ui-icon-refresh').addClass('ui-icon-alert').attr('id', [host, 'ALERT'].join('-'));
+          break;
+        case 'pause':
+          span.removeClass('ui-icon-pause').addClass('ui-icon-play').attr('id', [host, 'PLAY'].join('-'));
+          break;
+        case 'play':
+          span.removeClass('ui-icon-play').addClass('ui-icon-pause').attr('id', [host, 'PAUSE'].join('-'));
+          break;
+        case 'stop':
+          $('#'+ host + '-PAUSE').removeClass('ui-icon-pause').addClass('ui-icon-play').attr('id', [host, 'PLAY'].join('-'));
+          break;
+      }
+    }, "json");
   });
   $('.new_form').submit(function() {
     var queue = sanitize_input($("#new_queue").val());

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

@@ -12,10 +12,7 @@
   <% max = @sliders.max_children(host) || 'Not running' %>
 
   <h2><%= "#{host} (Total: <span id=\"total\"></span> Max: <span id=\"max\">#{max}</span>)" %>
-    <span id="<%= host %>-HUP" class="ui-icon ui-icon-refresh ui-corner-all ui-state-default corner HUP"></span>
-    <% if @sliders.reload?(host) %>
-    <span class="ui-icon ui-icon-alert corner"></span>
-    <% end %>
+    <%= daemon_buttons(host, false) %>
   </h2>
   <% @sliders.queue_values(host).each_pair do |queue,value| %>
     <p>
@@ -33,7 +30,7 @@
     <tr>
       <th>Hostname</th>
       <th>Current / Max Workers</th>
-      <th>HUP</th>
+      <th>Controls</th>
     </tr>
     <% @sliders.all_hosts.each do |host| %>
     <tr>
@@ -46,10 +43,7 @@
       </td>
       <td>
         <ul>
-          <li class="icons"><span id="<%= host %>-HUP" class="ui-icon ui-icon-refresh ui-corner-all ui-state-default HUP"></span></li>
-          <% if @sliders.reload?(host) %>
-          <li class="icons"><span class="ui-icon ui-icon-alert"></span></li>
-          <% end %>
+          <%= daemon_buttons(host) %>
         </ul>
       </td>
     </tr>

data/lib/resque-sliders/server.rb

@@ -28,6 +28,7 @@ module Resque
           end
 
           app.post '/sliders/:host' do
+            signals = params.reject { |x,y| x unless %w(pause stop play reload).include? x.to_s and y }
             if params[:quantity] && params[:queue]
               sliders = Commander.new
               queue = params[:queue].split.first
@@ -37,9 +38,12 @@ module Resque
               else
                 sliders.change(params[:host], queue, quantity)
               end
-            elsif params[:reload]
+            elsif signals.length == 1
               sliders = Commander.new
-              sliders.reload(params[:host])
+              sig = signals.keys.first.to_s
+              sliders.set_signal_flag(sig, params[:host])
+              content_type :json
+              {:signal => sig, :host => params[:host]}.to_json
             end
           end
 
@@ -57,6 +61,29 @@ module Resque
                 404
               end
             end
+
+            def daemon_buttons(host, list=true)
+              html_out = []
+              icon_base = 'ui-icon ui-corner-all ui-state-default'
+              case
+                when @sliders.reload?(host)
+                  %w(pause stop alert)
+                when (@sliders.pause?(host) or @sliders.stop?(host))
+                  %w(play stop refresh)
+                else
+                  %w(pause stop refresh)
+              end.each do |i|
+                id = "#{host}-#{i.upcase}"
+                klass = "#{icon_base} ui-icon-#{i}"
+                klass += ' corner' unless list
+                html_out << "<span id=\"#{id}\" class=\"#{klass}\"></span>"
+              end
+              if list
+                '<li class="icons">' + html_out.join("</li><li class=\"icons\">") + '</li>'
+              else
+                html_out.reverse.join
+              end
+            end
           end
 
           app.tabs << "Sliders"

data/lib/resque-sliders/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module ResqueSliders
-      Version = VERSION = '0.0.4'
+      Version = VERSION = '0.0.5'
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-sliders
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Kevin Mullin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 -08:00
+date: 2012-01-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency